Add all-the-icons-dired until nerd-icons-dired is available

Move some after-init hooks to use-package init blocks, where it's more
appropriate
This commit is contained in:
Evie Litherland-Smith 2024-08-16 11:41:08 +01:00
parent cc35e5b056
commit 0605c45d09

View file

@ -118,18 +118,34 @@ Configure the look and feel of Emacs
(add-to-list 'package-selected-packages 'nerd-icons)
(use-package nerd-icons
:if (package-installed-p 'nerd-icons))
:if (and (display-graphic-p)
(package-installed-p 'nerd-icons)))
(add-to-list 'package-selected-packages 'nerd-icons-ibuffer)
(use-package nerd-icons-ibuffer
:if (package-installed-p 'nerd-icons-ibuffer)
:if (and (display-graphic-p)
(package-installed-p 'nerd-icons-ibuffer))
:after nerd-icons
:hook (ibuffer-mode))
(add-to-list 'package-selected-packages 'nerd-icons-corfu)
(use-package nerd-icons-corfu
:if (package-installed-p 'nerd-icons-corfu)
:if (and (display-graphic-p)
(package-installed-p 'nerd-icons-corfu))
:after nerd-icons)
(add-to-list 'package-selected-packages 'all-the-icons)
(use-package all-the-icons
:if (and (display-graphic-p)
(package-installed-p 'all-the-icons)))
(add-to-list 'package-selected-packages 'all-the-icons-dired)
(use-package all-the-icons-dired
:if (and (display-graphic-p)
(package-installed-p 'all-the-icons-dired))
:after all-the-icons
:functions (all-the-icons-dired-mode)
:hook (dired-mode . (lambda () (all-the-icons-dired-mode +1))))
#+end_src
*** Modeline
#+begin_src emacs-lisp
@ -142,7 +158,6 @@ Configure the look and feel of Emacs
(use-package doom-modeline
:if (package-installed-p 'doom-modeline)
:functions (doom-modeline-mode)
:hook (after-init . (lambda () (doom-modeline-mode +1)))
:custom
(doom-modeline-env-version t)
(doom-modeline-github nil)
@ -153,6 +168,8 @@ Configure the look and feel of Emacs
(doom-modeline-irc-buffers t)
(doom-modeline-lsp t)
(doom-modeline-project-detection 'project)
:init
(doom-modeline-mode +1)
:config
(set-face-attribute 'doom-modeline nil :weight 'normal)
(set-face-attribute 'doom-modeline-buffer-path nil :slant 'normal))
@ -685,10 +702,10 @@ Configure email with iCalendar event support, to integrate with
(use-package flyspell
:hook ((text-mode . flyspell-mode)
(prog-mode . flyspell-prog-mode))
:init
(require 'ispell)
:custom
(flyspell-use-meta-tab nil))
(flyspell-use-meta-tab nil)
:init
(require 'ispell))
(add-to-list 'package-selected-packages 'flyspell-correct)
(use-package flyspell-correct
@ -759,12 +776,12 @@ Configure email with iCalendar event support, to integrate with
:functions (diff-hl-magit-pre-refresh
diff-hl-magit-post-refresh
global-diff-hl-mode)
:init
(add-hook 'magit-pre-refresh-hook #'diff-hl-magit-pre-refresh)
(add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh)
:custom
(diff-hl-disable-on-remote nil)
(diff-hl-draw-borders t)
:init
(add-hook 'magit-pre-refresh-hook #'diff-hl-magit-pre-refresh)
(add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh)
:config
(global-diff-hl-mode))
@ -1124,9 +1141,10 @@ Configure email with iCalendar event support, to integrate with
(use-package vertico
:if (package-installed-p 'vertico)
:functions vertico-mode
:hook (after-init . (lambda () (vertico-mode +1)))
:custom
(vertico-cycle t)
:init
(vertico-mode +1)
:config
(require 'vertico-directory))
@ -1134,11 +1152,12 @@ Configure email with iCalendar event support, to integrate with
(use-package marginalia
:if (package-installed-p 'marginalia)
:functions marginalia-mode
:hook (after-init . (lambda () (marginalia-mode +1)))
:custom
(marginalia-annotators '(marginalia-annotators-heavy
marginalia-annotators-light
nil))
:init
(marginalia-mode +1)
:config (marginalia-mode +1))
(add-to-list 'package-selected-packages 'orderless)
@ -1162,8 +1181,7 @@ Configure email with iCalendar event support, to integrate with
:functions (corfu-mode
global-corfu-mode
corfu-history-mode)
:hook ((after-init . (lambda () (global-corfu-mode +1)))
(minibuffer-setup . (lambda ()
:hook ((minibuffer-setup . (lambda ()
"Enable `corfu-mode' for `M-:' and `M-!'."
(when (local-variable-p 'completion-at-point-functions)
(corfu-mode +1)))))
@ -1178,6 +1196,8 @@ Configure email with iCalendar event support, to integrate with
(corfu-auto-delay 0.2)
(corfu-auto-prefix 3)
(corfu-preselect 'valid)
:init
(global-corfu-mode +1)
:config
(require 'corfu-history)
(when (require 'nerd-icons-corfu nil :noerror)
@ -1311,7 +1331,8 @@ Configure email with iCalendar event support, to integrate with
:after treesit
:functions (treesit-auto-add-to-auto-mode-alist
global-treesit-auto-mode)
:hook (after-init . (lambda () (global-treesit-auto-mode +1)))
:init
(global-treesit-auto-mode +1)
:config
(treesit-auto-add-to-auto-mode-alist))