emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(cli): load cli libs from doom.el

Browse source 
This simplifies the entry point for loading Doom (and/or its CLI
framework).
This commit is contained in:
Henrik Lissner 2022-08-07 18:50:42 +02:00
parent 50f0cebe92
commit 422baedad7
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/doom-cli-lib.el
View file

@ -10,6 +10,21 @@
(require 'seq) (require 'seq)
(require 'map) (require 'map)
;; Load these eagerly, since autoloads may not have been generated/loaded yet
(load! "lib/process")
(load! "lib/system")
(load! "lib/git")
(load! "lib/plist")
(load! "lib/files")
(load! "lib/debug")
(load! "lib/print")
;; (load! "lib/autoloads")
;; Ensure straight and core packages are ready to go for CLI commands.
(require 'doom-modules)
(require 'doom-packages)
;; TODO (require 'doom-profiles)
;; ;;
;;; Variables ;;; Variables

16
lisp/doom-cli.el
View file

@ -87,22 +87,6 @@
;; Just the... bear necessities~ ;; Just the... bear necessities~
(require 'doom (expand-file-name "doom" (file-name-directory load-file-name))) (require 'doom (expand-file-name "doom" (file-name-directory load-file-name)))
;; Load these eagerly, since autoloads haven't been generated/loaded yet
(load! "lib/process")
(load! "lib/system")
(load! "lib/plist")
(load! "lib/files")
(load! "lib/debug")
(load! "lib/print")
;; (load! "lib/autoloads")
;; Ensure straight and core packages are ready to go for CLI commands.
(require 'doom-modules)
(require 'doom-packages)
;; Our DSL, API, and everything nice.
(require 'doom-cli-lib)
;; Don't generate superfluous files when writing temp buffers. ;; Don't generate superfluous files when writing temp buffers.
(setq make-backup-files nil) (setq make-backup-files nil)
;; Stop user configuration from interfering with package management. ;; Stop user configuration from interfering with package management.

3
lisp/doom.el
View file

@ -353,6 +353,9 @@ Otherwise, `en/disable-command' (in novice.el.gz) is hardcoded to write them to
;; ...then load *the* one ;; ...then load *the* one
(require 'doom-lib) (require 'doom-lib)
;; ...and in batch session, load our CLI framework
(when noninteractive
(require 'doom-cli-lib))
;; ;;

1
modules/lang/emacs-lisp/autoload.el
View file

@ -262,7 +262,6 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'."
(setq doom-modules ',doom-modules (setq doom-modules ',doom-modules
doom-disabled-packages ',doom-disabled-packages) doom-disabled-packages ',doom-disabled-packages)
(require 'doom) (require 'doom)
(require 'doom-cli-lib)
(ignore-errors (load ,user-init-file t t)) (ignore-errors (load ,user-init-file t t))
(setq byte-compile-warnings (setq byte-compile-warnings
'(obsolete cl-functions '(obsolete cl-functions