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

fix(treemacs): treemacs-nerd-icons load order w/ +lsp

Browse source 
lsp-treemacs changes the default Treemacs theme, so treemacs-nerd-icons
needs to be loaded after it, if it's installed/enabled.

Fix: #7519
Fix: doomemacs/themes#801
Ref: emacs-lsp/lsp-treemacs#89
This commit is contained in:
Henrik Lissner 2024-03-11 00:37:17 -04:00
parent 41e81f67a7
commit dec058fabb
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/ui/treemacs/config.el
View file

@ -44,7 +44,12 @@ This must be set before `treemacs' has loaded.")
(use-package! treemacs-nerd-icons (use-package! treemacs-nerd-icons
:after treemacs :defer t
;; HACK: Because `lsp-treemacs' mutates Treemacs' default theme, and
;; `treemacs-nerd-icons' reads from it to populate its nerd-icons theme,
;; load order is important to ensure they don't step on each other's toes.
:init (with-eval-after-load (if (modulep! +lsp) 'lsp-treemacs 'treemacs)
(require 'treemacs-nerd-icons))
:config (treemacs-load-theme "nerd-icons")) :config (treemacs-load-theme "nerd-icons"))