From b245237b0c598220f43a404c302a9d6f3d70fc2d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 25 Jun 2019 11:55:35 +0200 Subject: [PATCH] Move custom-file to DOOMDIR/init.el (And don't auto-load it at startup; no need) --- core/core-modules.el | 6 +----- core/core.el | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/core-modules.el b/core/core-modules.el index 9ac839e5e..2c2367b6c 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -96,11 +96,7 @@ non-nil." (load! "config" (plist-get plist :path) t))) doom-modules) (run-hook-wrapped 'doom-init-modules-hook #'doom-try-run-hook) - (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))))) + (load! "config" doom-private-dir t)))) ;; diff --git a/core/core.el b/core/core.el index 80e8f066d..193be22cf 100644 --- a/core/core.el +++ b/core/core.el @@ -201,6 +201,7 @@ Doom was setup, which may cause problems.") async-byte-compile-log-file (concat doom-etc-dir "async-bytecomp.log") auto-save-list-file-name (concat doom-cache-dir "autosave") backup-directory-alist (list (cons "." (concat doom-cache-dir "backup/"))) + custom-file (concat doom-private-dir "init.el") desktop-dirname (concat doom-etc-dir "desktop") desktop-base-file-name "autosave" desktop-base-lock-name "autosave-lock"