From 414206d3dd6ef3995fff67a89f26f13b0f0e1bf9 Mon Sep 17 00:00:00 2001 From: ckie Date: Mon, 27 Dec 2021 23:15:28 +0200 Subject: [PATCH] nix integration --- core/core-cli.el | 4 ++-- core/core.el | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/core-cli.el b/core/core-cli.el index 2ebd05ed6..fc49eb74f 100644 --- a/core/core-cli.el +++ b/core/core-cli.el @@ -15,10 +15,10 @@ These are loaded when a Doom's CLI starts up. There users and modules can define additional CLI commands, or reconfigure existing ones to better suit their purpose.") -(defvar doom-cli-log-file (concat doom-local-dir "doom.log") +(defvar doom-cli-log-file (concat doom-cache-dir "doom.log") "Where to write the extended output to.") -(defvar doom-cli-log-error-file (concat doom-local-dir "doom.error.log") +(defvar doom-cli-log-error-file (concat doom-cache-dir "doom.error.log") "Where to write the last backtrace to.") (defvar doom--cli-log-buffer (generate-new-buffer " *doom log*")) diff --git a/core/core.el b/core/core.el index c74f5b031..bbc5bab9c 100644 --- a/core/core.el +++ b/core/core.el @@ -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. @@ -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.") -(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.") @@ -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 -- 2.33.0