From 346d7bdf360f1d0a66504de721d7a1fb75f148d2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 8 Dec 2017 22:58:52 -0500 Subject: [PATCH] Detect init.el in any module, instead of private user module User module (named after user-login-name) is no longer automatically loaded or detected, and must be explicitly mentioned in the doom! macro of your emacs init.el file. Also, any module can now have an init.el file, which will be run before any modules are loaded. --- core/core-packages.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 74ee9f8b5..ff4e53158 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -308,16 +308,15 @@ include all modules, enabled or otherwise." MODULES is an malformed plist of modules to load." (doom-initialize-modules modules) - (when (and user-login-name - (not (doom-module-loaded-p :private (intern user-login-name)))) - (doom-module-enable :private user-login-name)) `(let (file-name-handler-alist) (setq doom-modules ',doom-modules) (unless noninteractive - (load ,(doom-module-path :private user-login-name "init") t t) ,@(cl-loop for (module . submodule) in (doom-module-pairs) - collect `(require! ,module ,submodule nil t)) + for module-path = (doom-module-path module submodule) + collect `(load! init ,module-path t) into inits + collect `(require! ,module ,submodule nil t) into configs + finally return (append inits configs)) (when (display-graphic-p) (require 'server)