nix-doom-emacs: updating hunks to better align with newer doom revisions

This commit is contained in:
László Vaskó
2020-09-06 14:43:28 +02:00
parent 2429aa244c
commit d834090002
2 changed files with 7 additions and 10 deletions

View File

@ -1,15 +1,12 @@
diff --git a/core/core.el b/core/core.el
index cb12f8d08..03f370691 100644
index c8cfb0495..d8ed107bd 100644
--- a/core/core.el
+++ b/core/core.el
@@ -63,22 +63,21 @@ decrease this. If you experience stuttering, increase this.")
"The root directory for Doom's modules. Must end with a slash.")
@@ -92,20 +92,20 @@ envvar will enable this at startup.")
(defconst doom-local-dir
- (if-let (localdir (getenv "DOOMLOCALDIR"))
- (expand-file-name (file-name-as-directory localdir))
(if-let (localdir (getenv "DOOMLOCALDIR"))
(expand-file-name (file-name-as-directory localdir))
- (concat doom-emacs-dir ".local/"))
+ (or (getenv "DOOMLOCALDIR")
+ "@local@/")
"Root directory for local storage.