From 631c4004ba3688817c420fa9c849497f6c42aa19 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 25 Aug 2018 17:26:57 +0200 Subject: [PATCH] Load custom-file only once & after user's config This change facilitates the users that prefer their custom-file somewhere other than doom-local-dir (e.g. in ~/.doom.d/custom.el). This change prevents loading both files during startup. Just change `custom-file` and Doom will load it after your config.el is loaded (but before doom-post-init-hook runs). --- core/core-modules.el | 4 ++++ core/core.el | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-modules.el b/core/core-modules.el index e6cdf15e4..b4ebc0a2b 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -56,6 +56,10 @@ non-nil." (load! "config" (plist-get plist :path) t))) doom-modules) (load! "config" doom-private-dir t) + (unless custom-file + (setq custom-file (concat doom-local-dir "custom.el"))) + (when (stringp custom-file) + (load custom-file t t t)) (run-hook-wrapped 'doom-post-init-hook #'doom-try-run-hook)))) diff --git a/core/core.el b/core/core.el index 34d7b31a3..a597d04c8 100644 --- a/core/core.el +++ b/core/core.el @@ -164,7 +164,6 @@ Doom was setup, which can cause problems.") abbrev-file-name (concat doom-local-dir "abbrev.el") auto-save-list-file-name (concat doom-cache-dir "autosave") backup-directory-alist (list (cons "." (concat doom-cache-dir "backup/"))) - custom-file (concat doom-local-dir "custom.el") mc/list-file (concat doom-etc-dir "mc-lists.el") pcache-directory (concat doom-cache-dir "pcache/") request-storage-directory (concat doom-cache-dir "request") @@ -472,7 +471,6 @@ in interactive sessions, nil otherwise (but logs a warning)." (add-to-list 'load-path doom-core-dir) -(load custom-file t t t) (require 'core-lib) (require 'core-modules) (when noninteractive