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

refactor(lib): doom/{reload,upgrade}: customizable commands

Browse source 
Ref: #8024
This commit is contained in:
Henrik Lissner 2024-08-24 16:36:01 -04:00
parent 4bc4b54eb9
commit a8ba8feecb
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/doom.el
View file

@ -247,6 +247,12 @@
Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar; Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar;
whichever is found first. Must end in a slash.") whichever is found first. Must end in a slash.")
(defvar doom-bin-dir (expand-file-name "bin/" doom-emacs-dir)
"Where Doom's executables are stored.
Defaults to $EMACSDIR/bin, where $EMACSDIR is `doom-emacs-dir'. Must end in a
slash.")
;; DEPRECATED: .local will be removed entirely in 3.0 ;; DEPRECATED: .local will be removed entirely in 3.0
(defvar doom-local-dir (defvar doom-local-dir
(if-let (localdir (getenv-internal "DOOMLOCALDIR")) (if-let (localdir (getenv-internal "DOOMLOCALDIR"))

11
lisp/lib/config.el
View file

@ -55,7 +55,8 @@ And jumps to your `doom!' block."
(defmacro doom--if-compile (command on-success &optional on-failure) (defmacro doom--if-compile (command on-success &optional on-failure)
(declare (indent 2)) (declare (indent 2))
`(let ((default-directory doom-emacs-dir)) `(let ((default-directory doom-emacs-dir)
(exec-path (cons doom-bin-dir exec-path)))
(with-current-buffer (compile ,command t) (with-current-buffer (compile ,command t)
(let ((w (get-buffer-window (current-buffer)))) (let ((w (get-buffer-window (current-buffer))))
(select-window w) (select-window w)
@ -69,6 +70,8 @@ And jumps to your `doom!' block."
,on-failure)) ,on-failure))
nil 'local))))) nil 'local)))))
(defvar doom-reload-command "doom sync -B -e"
"Command that `doom/reload' runs.")
;;;###autoload ;;;###autoload
(defun doom/reload () (defun doom/reload ()
"Reloads your private config. "Reloads your private config.
@ -83,7 +86,7 @@ package list, and lastly, reloads your private config.el.
Runs `doom-after-reload-hook' afterwards." Runs `doom-after-reload-hook' afterwards."
(interactive) (interactive)
(mapc #'require (cdr doom-incremental-packages)) (mapc #'require (cdr doom-incremental-packages))
(doom--if-compile (format "%S sync -e" doom-bin) (doom--if-compile doom-reload-command
(doom-context-with '(reload modules) (doom-context-with '(reload modules)
(doom-run-hooks 'doom-before-reload-hook) (doom-run-hooks 'doom-before-reload-hook)
(doom-load (file-name-concat doom-user-dir doom-module-init-file) t) (doom-load (file-name-concat doom-user-dir doom-module-init-file) t)
@ -131,10 +134,12 @@ imported into Emacs."
(doom-load-envvars-file doom-env-file) (doom-load-envvars-file doom-env-file)
(message "Reloaded %S" (abbreviate-file-name doom-env-file)))))) (message "Reloaded %S" (abbreviate-file-name doom-env-file))))))
(defvar doom-upgrade-command "doom upgrade -B --force"
"Command that `doom/upgrade' runs.")
;;;###autoload ;;;###autoload
(defun doom/upgrade () (defun doom/upgrade ()
"Run 'doom upgrade' then prompt to restart Emacs." "Run 'doom upgrade' then prompt to restart Emacs."
(interactive) (interactive)
(doom--if-compile (format "%S upgrade --force" doom-bin) (doom--if-compile doom-upgrade-command
(when (y-or-n-p "You must restart Emacs for the upgrade to take effect.\n\nRestart Emacs?") (when (y-or-n-p "You must restart Emacs for the upgrade to take effect.\n\nRestart Emacs?")
(doom/restart-and-restore)))) (doom/restart-and-restore))))