mirror of
https://github.com/nix-community/nix-doom-emacs
synced 2025-08-13 13:13:36 -05:00
nix-doom-emacs: updating hunks to better align with newer doom revisions
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/core/autoload/config.el b/core/autoload/config.el
|
diff --git a/core/autoload/config.el b/core/autoload/config.el
|
||||||
index 6bb9ae300..81ab62860 100644
|
index 1e643cf49..501cbfba4 100644
|
||||||
--- a/core/autoload/config.el
|
--- a/core/autoload/config.el
|
||||||
+++ b/core/autoload/config.el
|
+++ b/core/autoload/config.el
|
||||||
@@ -20,7 +20,7 @@
|
@@ -23,7 +23,7 @@
|
||||||
(defun doom/find-file-in-private-config ()
|
(defun doom/find-file-in-private-config ()
|
||||||
"Search for a file in `doom-private-dir' inside nixos-config."
|
"Search for a file in `doom-private-dir' inside nixos-config."
|
||||||
(interactive)
|
(interactive)
|
||||||
@@ -10,4 +10,4 @@ index 6bb9ae300..81ab62860 100644
|
|||||||
+ (doom-project-find-file "@private@"))
|
+ (doom-project-find-file "@private@"))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun doom/reload ()
|
(defun doom/goto-private-init-file ()
|
||||||
|
@@ -1,15 +1,12 @@
|
|||||||
diff --git a/core/core.el b/core/core.el
|
diff --git a/core/core.el b/core/core.el
|
||||||
index cb12f8d08..03f370691 100644
|
index c8cfb0495..d8ed107bd 100644
|
||||||
--- a/core/core.el
|
--- a/core/core.el
|
||||||
+++ b/core/core.el
|
+++ b/core/core.el
|
||||||
@@ -63,22 +63,21 @@ decrease this. If you experience stuttering, increase this.")
|
@@ -92,20 +92,20 @@ envvar will enable this at startup.")
|
||||||
"The root directory for Doom's modules. Must end with a slash.")
|
|
||||||
|
|
||||||
(defconst doom-local-dir
|
(defconst doom-local-dir
|
||||||
- (if-let (localdir (getenv "DOOMLOCALDIR"))
|
(if-let (localdir (getenv "DOOMLOCALDIR"))
|
||||||
- (expand-file-name (file-name-as-directory localdir))
|
(expand-file-name (file-name-as-directory localdir))
|
||||||
- (concat doom-emacs-dir ".local/"))
|
- (concat doom-emacs-dir ".local/"))
|
||||||
+ (or (getenv "DOOMLOCALDIR")
|
|
||||||
+ "@local@/")
|
+ "@local@/")
|
||||||
"Root directory for local storage.
|
"Root directory for local storage.
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user