Simplify core loading process
This commit is contained in:
parent
7409890e78
commit
65748c5809
3 changed files with 8 additions and 10 deletions
|
@ -26,9 +26,7 @@ If neither is available, run all tests in all enabled modules."
|
||||||
(condition-case-unless-debug ex
|
(condition-case-unless-debug ex
|
||||||
(let (targets)
|
(let (targets)
|
||||||
;; ensure DOOM is initialized
|
;; ensure DOOM is initialized
|
||||||
(let (noninteractive)
|
(load (expand-file-name "core/core.el" user-emacs-directory) nil t)
|
||||||
(load (expand-file-name "init.el" user-emacs-directory) nil t))
|
|
||||||
(remove-hook 'doom-init-hook #'doom--display-benchmark)
|
|
||||||
;; collect targets
|
;; collect targets
|
||||||
(cond ((and command-line-args-left
|
(cond ((and command-line-args-left
|
||||||
(equal (car command-line-args-left) "--"))
|
(equal (car command-line-args-left) "--"))
|
||||||
|
|
|
@ -312,12 +312,6 @@ MODULES is an malformed plist of modules to load."
|
||||||
(setq doom-modules ',doom-modules)
|
(setq doom-modules ',doom-modules)
|
||||||
|
|
||||||
(unless noninteractive
|
(unless noninteractive
|
||||||
(require 'core-ui) ; draw me like one of your French editors
|
|
||||||
(require 'core-popups) ; taming sudden yet inevitable windows
|
|
||||||
(require 'core-editor) ; baseline configuration for text editing
|
|
||||||
(require 'core-projects) ; making Emacs project-aware
|
|
||||||
(require 'core-keybinds) ; centralized keybind system + which-key
|
|
||||||
|
|
||||||
(load ,(doom-module-path :private user-login-name "init") t t)
|
(load ,(doom-module-path :private user-login-name "init") t t)
|
||||||
,@(cl-loop for (module . submodule) in (doom--module-pairs)
|
,@(cl-loop for (module . submodule) in (doom--module-pairs)
|
||||||
collect `(require! ,module ,submodule t))
|
collect `(require! ,module ,submodule t))
|
||||||
|
|
|
@ -185,7 +185,13 @@ ability to invoke the debugger in debug mode."
|
||||||
('error
|
('error
|
||||||
(lwarn 'doom-autoloads :warning
|
(lwarn 'doom-autoloads :warning
|
||||||
"%s in autoloads.el -> %s"
|
"%s in autoloads.el -> %s"
|
||||||
(car ex) (error-message-string ex)))))
|
(car ex) (error-message-string ex))))
|
||||||
|
|
||||||
|
(load! core-ui) ; draw me like one of your French editors
|
||||||
|
(load! core-popups) ; taming sudden yet inevitable windows
|
||||||
|
(load! core-editor) ; baseline configuration for text editing
|
||||||
|
(load! core-projects) ; making Emacs project-aware
|
||||||
|
(load! core-keybinds)) ; centralized keybind system + which-key
|
||||||
|
|
||||||
(add-hook! '(emacs-startup-hook doom-reload-hook)
|
(add-hook! '(emacs-startup-hook doom-reload-hook)
|
||||||
#'doom|finalize)
|
#'doom|finalize)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue