refactor(cli): load cli libs from doom.el
This simplifies the entry point for loading Doom (and/or its CLI framework).
This commit is contained in:
parent
50f0cebe92
commit
422baedad7
4 changed files with 18 additions and 17 deletions
|
@ -10,6 +10,21 @@
|
|||
(require 'seq)
|
||||
(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
|
||||
|
|
|
@ -87,22 +87,6 @@
|
|||
;; Just the... bear necessities~
|
||||
(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.
|
||||
(setq make-backup-files nil)
|
||||
;; Stop user configuration from interfering with package management.
|
||||
|
|
|
@ -353,6 +353,9 @@ Otherwise, `en/disable-command' (in novice.el.gz) is hardcoded to write them to
|
|||
|
||||
;; ...then load *the* one
|
||||
(require 'doom-lib)
|
||||
;; ...and in batch session, load our CLI framework
|
||||
(when noninteractive
|
||||
(require 'doom-cli-lib))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
@ -262,7 +262,6 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'."
|
|||
(setq doom-modules ',doom-modules
|
||||
doom-disabled-packages ',doom-disabled-packages)
|
||||
(require 'doom)
|
||||
(require 'doom-cli-lib)
|
||||
(ignore-errors (load ,user-init-file t t))
|
||||
(setq byte-compile-warnings
|
||||
'(obsolete cl-functions
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue