refactor!: redesign module init/config hooks
BREAKING CHANGE: For consistency and correctness, I've renamed the module init/config hooks, and added new ones: - Adds doom-before-modules-config-hook - Adds doom-after-modules-config-hook (replaced doom-before-init-modules-hook) - Adds doom-before-modules-init-hook - Adds doom-after-modules-init-hook (replaced doom-init-modules-hook) - Removed doom-after-init-modules-hook (replaced w/ after-init-hook) The old naming (and timing) was counterintuitive. Now, it's named after the loaded file group (init.el vs config.el), and I added before/after variants. Altogether, this should make them less ambiguous. I've also moved some functions in various modules to more correct hooks. Load order before this change: - $EMACSDIR/early-init.el - $EMACSDIR/lisp/doom.el - $EMACSDIR/lisp/doom-start.el - $DOOMDIR/init.el - {$DOOMDIR,~/.emacs.d}/modules/*/*/init.el - `doom-before-init-modules-hook' - {$DOOMDIR,~/.emacs.d}/modules/*/*/config.el - `doom-init-modules-hook' - $DOOMDIR/config.el - `doom-after-init-modules-hook' - `after-init-hook' - `emacs-startup-hook' - `window-setup-hook' Load order after this change: - $EMACSDIR/early-init.el - $EMACSDIR/lisp/doom.el - $EMACSDIR/lisp/doom-start.el - $DOOMDIR/init.el - `doom-before-modules-init-hook' - {$DOOMDIR,~/.emacs.d}/modules/*/*/init.el - `doom-after-modules-init-hook' - `doom-before-modules-config-hook' - {$DOOMDIR,~/.emacs.d}/modules/*/*/config.el - `doom-after-modules-config-hook' - $DOOMDIR/config.el - `after-init-hook' - `emacs-startup-hook' - `window-setup-hook'
This commit is contained in:
parent
57a91235bd
commit
7a2be67efa
8 changed files with 39 additions and 39 deletions
|
@ -29,7 +29,7 @@ directives. By default, this only recognizes C directives.")
|
|||
(defvar evil-respect-visual-line-mode nil)
|
||||
|
||||
(use-package! evil
|
||||
:hook (doom-init-modules . evil-mode)
|
||||
:hook (doom-after-modules-config . evil-mode)
|
||||
:demand t
|
||||
:preface
|
||||
(setq evil-ex-search-vim-style-regexp t
|
||||
|
@ -77,7 +77,7 @@ directives. By default, this only recognizes C directives.")
|
|||
(advice-add #'help-with-tutorial :after (lambda (&rest _) (evil-emacs-state +1)))
|
||||
|
||||
;; Done in a hook to ensure the popup rules load as late as possible
|
||||
(add-hook! 'doom-init-modules-hook
|
||||
(add-hook! 'doom-after-modules-config-hook
|
||||
(defun +evil--init-popup-rules-h ()
|
||||
(set-popup-rules!
|
||||
'(("^\\*evil-registers" :size 0.3)
|
||||
|
@ -85,7 +85,7 @@ directives. By default, this only recognizes C directives.")
|
|||
|
||||
;; Change the cursor color in emacs state. We do it this roundabout way
|
||||
;; to ensure changes in theme doesn't break these colors.
|
||||
(add-hook! '(doom-load-theme-hook doom-init-modules-hook)
|
||||
(add-hook! '(doom-load-theme-hook doom-after-modules-config-hook)
|
||||
(defun +evil-update-cursor-color-h ()
|
||||
(put 'cursor 'evil-emacs-color (face-foreground 'warning))
|
||||
(put 'cursor 'evil-normal-color (face-background 'cursor))))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue