diff --git a/nix-integration.patch b/nix-integration.patch index e2ce234..93100e4 100644 --- a/nix-integration.patch +++ b/nix-integration.patch @@ -1,17 +1,17 @@ diff --git a/core/core.el b/core/core.el -index a5f7664db..894c1d641 100644 +index c74f5b031..9ee1687fb 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@/"))) +@@ -68,7 +68,7 @@ envvar will enable this at startup.") + (defconst doom-local-dir + (if-let (localdir (getenv-internal "DOOMLOCALDIR")) + (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. +@@ -76,13 +76,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.") @@ -27,13 +27,11 @@ index a5f7664db..894c1d641 100644 "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/"))) +@@ -160,6 +160,7 @@ users).") + ;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged + ;; when upgrading Doom). + (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 "cache/eln/")) - (with-eval-after-load 'comp - ;; HACK Disable native-compilation for some troublesome packages + (with-eval-after-load 'comp + ;; HACK Disable native-compilation for some troublesome packages