aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-06-29 19:20:19 -0400
committerCraig Jennings <c@cjennings.net>2026-06-29 19:20:19 -0400
commit142bbc45c1c64765bb21b0537aa2b7a89300b238 (patch)
tree2d8a7ba822baa4b0883b8c2397f5474e617c4e2c /modules
parentaa81a5ee6e6785536afcdceb2f55142273b43447 (diff)
downloaddotemacs-142bbc45c1c64765bb21b0537aa2b7a89300b238.tar.gz
dotemacs-142bbc45c1c64765bb21b0537aa2b7a89300b238.zip
refactor(icons): drop all-the-icons, nerd-icons drives everything
nerd-icons already rendered every icon in the config (dashboard, dirvish, ibuffer, completion). all-the-icons survived only as scaffolding: a font-install helper, the all-the-icons-nerd-fonts bridge, and a terminal-blanking advice block the nerd-icons one beside it already duplicated. I removed all of it and pointed the font-install helper at nerd-icons (Symbols Nerd Font Mono), keeping the auto-install-on-first-GUI-frame convenience. I updated the font-config tests to the renamed helper.
Diffstat (limited to 'modules')
-rw-r--r--modules/font-config.el35
-rw-r--r--modules/keyboard-compat.el6
2 files changed, 15 insertions, 26 deletions
diff --git a/modules/font-config.el b/modules/font-config.el
index 2be051ddc..095b4c8c1 100644
--- a/modules/font-config.el
+++ b/modules/font-config.el
@@ -165,32 +165,27 @@ If FRAME is nil, uses the selected frame."
t
nil))
-;; ------------------------------- All The Icons -------------------------------
-;; icons made available through fonts
+;; ------------------------------- Nerd Icons fonts ----------------------------
+;; nerd-icons (configured in nerd-icons-config.el) renders glyphs from the
+;; "Symbols Nerd Font Mono" font. Auto-install it on the first GUI frame when
+;; it is missing -- the same convenience the dropped all-the-icons setup gave.
-(declare-function all-the-icons-install-fonts "all-the-icons")
+(declare-function nerd-icons-install-fonts "nerd-icons")
-(defun cj/maybe-install-all-the-icons-fonts (&optional _frame)
- "Install all-the-icons fonts if needed and we have a GUI."
+(defun cj/maybe-install-nerd-icons-fonts (&optional _frame)
+ "Install the nerd-icons font if it is missing and we have a GUI."
(when (and (env-gui-p)
- (not (cj/font-installed-p "all-the-icons")))
- (all-the-icons-install-fonts t)
+ (not (cj/font-installed-p "Symbols Nerd Font Mono")))
+ (nerd-icons-install-fonts t)
;; Remove this hook after successful installation
- (remove-hook 'server-after-make-frame-hook #'cj/maybe-install-all-the-icons-fonts)))
+ (remove-hook 'server-after-make-frame-hook #'cj/maybe-install-nerd-icons-fonts)))
-(use-package all-the-icons
- :demand t
- :config
- ;; Handle both daemon and non-daemon modes
+;; nerd-icons loads after this module (see init.el order), so defer the wiring
+;; until it is present. Daemon: install on the first GUI frame; otherwise now.
+(with-eval-after-load 'nerd-icons
(if (daemonp)
- (add-hook 'server-after-make-frame-hook #'cj/maybe-install-all-the-icons-fonts)
- (cj/maybe-install-all-the-icons-fonts)))
-
-(use-package all-the-icons-nerd-fonts
- :after all-the-icons
- :demand t
- :config
- (all-the-icons-nerd-fonts-prefer))
+ (add-hook 'server-after-make-frame-hook #'cj/maybe-install-nerd-icons-fonts)
+ (cj/maybe-install-nerd-icons-fonts)))
;; ----------------------------- Emoji Fonts Per OS ----------------------------
diff --git a/modules/keyboard-compat.el b/modules/keyboard-compat.el
index 172f96c7b..9395b9c86 100644
--- a/modules/keyboard-compat.el
+++ b/modules/keyboard-compat.el
@@ -68,12 +68,6 @@ This runs after init to override any package settings."
nerd-icons-icon-for-buffer))
(advice-add fn :around #'cj/--icon-blank-in-terminal)))
-(with-eval-after-load 'all-the-icons
- (dolist (fn '(all-the-icons-icon-for-file
- all-the-icons-icon-for-dir
- all-the-icons-icon-for-mode))
- (advice-add fn :around #'cj/--icon-blank-in-terminal)))
-
;; =============================================================================
;; GUI-specific fixes
;; =============================================================================