Files
nix-doom-emacs/nix-integration.patch
2021-05-13 03:21:41 +05:00

40 lines
1.7 KiB
Diff

diff --git a/core/core.el b/core/core.el
index a5f7664db..894c1d641 100644
--- a/core/core.el
+++ b/core/core.el
@@ -75,7 +75,7 @@ envvar will enable this at startup.")
(let ((localdir (getenv-internal "DOOMLOCALDIR")))
(if localdir
(expand-file-name (file-name-as-directory localdir))
- (concat doom-emacs-dir ".local/")))
+ (concat doom-emacs-dir "@local@/")))
"Root directory for local storage.
Use this as a storage location for this system's installation of Doom Emacs.
@@ -83,13 +83,13 @@ Use this as a storage location for this system's installation of Doom Emacs.
These files should not be shared across systems. By default, it is used by
`doom-etc-dir' and `doom-cache-dir'. Must end with a slash.")
-(defconst doom-etc-dir (concat doom-local-dir "etc/")
+(defconst doom-etc-dir "~/.local/doom/"
"Directory for non-volatile local storage.
Use this for files that don't change much, like server binaries, external
dependencies or long-term shared data. Must end with a slash.")
-(defconst doom-cache-dir (concat doom-local-dir "cache/")
+(defconst doom-cache-dir "~/.cache/doom/"
"Directory for volatile local storage.
Use this for files that change often, like cache files. Must end with a slash.")
@@ -175,7 +175,8 @@ users).")
;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
;; when upgrading Doom).
(when (boundp 'native-comp-eln-load-path)
- (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/")))
+ (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))
+ (add-to-list 'native-comp-eln-load-path (concat doom-local-dir "cache/eln/")))
(with-eval-after-load 'comp
;; HACK Disable native-compilation for some troublesome packages