Switch all-the-icons back for nerd-icons fully

This commit is contained in:
Evie Litherland-Smith 2024-08-09 16:44:38 +01:00
parent 6f07040cfb
commit dd5d4ea7ec
2 changed files with 35 additions and 29 deletions

View file

@ -106,28 +106,24 @@ Configure the look and feel of Emacs
(add-hook 'server-after-make-frame-hook (add-hook 'server-after-make-frame-hook
(lambda () (when (display-graphic-p) (my/load-theme-and-configure)))) (lambda () (when (display-graphic-p) (my/load-theme-and-configure))))
(use-package all-the-icons
:straight t)
(use-package all-the-icons-dired
:straight t
:after all-the-icons
:hook (dired-mode . all-the-icons-dired-mode))
(use-package all-the-icons-ibuffer
:straight t
:after all-the-icons
:hook (ibuffer-mode . all-the-icons-ibuffer-mode))
(use-package all-the-icons-completion
:straight t
:after (all-the-icons marginalia-mode)
:hook (marginalia-mode . all-the-icons-completion-marginalia-setup))
(use-package nerd-icons (use-package nerd-icons
:straight t) :straight t)
(use-package nerd-icons-dired
:straight t
:after (nerd-icons dired)
:hook (dired-mode . nerd-icons-dired-mode))
(use-package nerd-icons-ibuffer
:straight t
:after (nerd-icons ibuffer)
:hook (ibuffer-mode . nerd-icons-ibuffer-mode))
(use-package nerd-icons-completion
:straight t
:after (nerd-icons marginalia)
:hook (marginalia-mode . nerd-icons-completion-marginalia-setup))
(use-package nerd-icons-corfu (use-package nerd-icons-corfu
:straight t :straight t
:after nerd-icons) :after nerd-icons)
@ -1052,7 +1048,7 @@ Configure email with iCalendar event support, to integrate with
(expand-file-name "~/Documents/library/"))) (expand-file-name "~/Documents/library/")))
:config :config
(require 'org) (require 'org)
(require 'all-the-icons) (require 'nerd-icons)
(setopt org-cite-insert-processor 'citar (setopt org-cite-insert-processor 'citar
org-cite-follow-processor 'citar org-cite-follow-processor 'citar
org-cite-activate-processor 'citar) org-cite-activate-processor 'citar)
@ -1060,25 +1056,36 @@ Configure email with iCalendar event support, to integrate with
(add-to-list 'org-cite-global-bibliography bibfile)) (add-to-list 'org-cite-global-bibliography bibfile))
(defvar citar-indicator-files-icons (defvar citar-indicator-files-icons
(citar-indicator-create (citar-indicator-create
:symbol (all-the-icons-octicon "file-pdf") :symbol (nerd-icons-octicon
"nf-oct-file"
:face 'nerd-icons-green
:v-adjust -0.1)
:function #'citar-has-files :function #'citar-has-files
:padding " " ; need this because the default padding is too low for these icons :padding " " ; need this because the default padding is too low for these icons
:tag "has:files")) :tag "has:files"))
(defvar citar-indicator-links-icons (defvar citar-indicator-links-icons
(citar-indicator-create (citar-indicator-create
:symbol (all-the-icons-octicon "link") :symbol (nerd-icons-octicon
"nf-oct-link"
:face 'nerd-icons-orange
:v-adjust 0.01)
:function #'citar-has-links :function #'citar-has-links
:padding " " ; need this because the default padding is too low for these icons :padding " " ; need this because the default padding is too low for these icons
:tag "has:links")) :tag "has:links"))
(defvar citar-indicator-notes-icons (defvar citar-indicator-notes-icons
(citar-indicator-create (citar-indicator-create
:symbol (all-the-icons-octicon "file-text") :symbol (nerd-icons-octicon
"nf-oct-note"
:face 'nerd-icons-blue
:v-adjust -0.3)
:function #'citar-has-notes :function #'citar-has-notes
:padding " " ; need this because the default padding is too low for these icons :padding " " ; need this because the default padding is too low for these icons
:tag "has:notes")) :tag "has:notes"))
(defvar citar-indicator-cited-icons (defvar citar-indicator-cited-icons
(citar-indicator-create (citar-indicator-create
:symbol (all-the-icons-octicon "file-binary") :symbol (nerd-icons-octicon
"nf-oct-circle"
:face 'nerd-icon-green)
:function #'citar-is-cited :function #'citar-is-cited
:padding " " ; need this because the default padding is too low for these icons :padding " " ; need this because the default padding is too low for these icons
:tag "is:cited")) :tag "is:cited"))

View file

@ -1,8 +1,4 @@
(("all-the-icons-completion" . "4c8bcad8033f5d0868ce82ea3807c6cd46c4a198") (("apheleia" . "3e347cff47eb0072b47c56f6188c4f440e477770")
("all-the-icons-dired" . "e157f0668f22ed586aebe0a2c0186ab07702986c")
("all-the-icons-ibuffer" . "280c99bb32dae3f0c43e97756d495beaf4554460")
("all-the-icons.el" . "39ef44f810c34e8900978788467cc675870bcd19")
("apheleia" . "3e347cff47eb0072b47c56f6188c4f440e477770")
("base16-emacs" . "8789114e45d09d114e0e197cb090ce7beb993901") ("base16-emacs" . "8789114e45d09d114e0e197cb090ce7beb993901")
("bbdb" . "53e8ba04c47b3542db75b68f9663941daf2e6ca4") ("bbdb" . "53e8ba04c47b3542db75b68f9663941daf2e6ca4")
("cape" . "5c468d6d657e8dc604ddf3feb80f70e1e05ac0a1") ("cape" . "5c468d6d657e8dc604ddf3feb80f70e1e05ac0a1")
@ -47,7 +43,10 @@
("marginalia" . "7a7f3363d042d1bf43ae697f4401638ed18230a5") ("marginalia" . "7a7f3363d042d1bf43ae697f4401638ed18230a5")
("markdown-mode" . "8a7773f87733866a961ea4c518a4a2f283f21970") ("markdown-mode" . "8a7773f87733866a961ea4c518a4a2f283f21970")
("melpa" . "c13d67c87248b9af8f9d6265a8626a330f9d478c") ("melpa" . "c13d67c87248b9af8f9d6265a8626a330f9d478c")
("nerd-icons-completion" . "426a1d7c29a04ae8e6ae9b55b0559f11a1e8b420")
("nerd-icons-corfu" . "7077bb76fefc15aed967476406a19dc5c2500b3c") ("nerd-icons-corfu" . "7077bb76fefc15aed967476406a19dc5c2500b3c")
("nerd-icons-dired" . "c1c73488630cc1d19ce1677359f614122ae4c1b9")
("nerd-icons-ibuffer" . "16270e898abbba2bd810cbf97f999c6142863101")
("nerd-icons.el" . "dcfc64152ada7514bcdd1c6ce45590c359445ec6") ("nerd-icons.el" . "dcfc64152ada7514bcdd1c6ce45590c359445ec6")
("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5") ("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5")
("nongnu-elpa" . "f031337c6ee125455a98e2de899a563388e5de19") ("nongnu-elpa" . "f031337c6ee125455a98e2de899a563388e5de19")