Remove all-the-icons, back to nerd-icons

Only missing nerd-icons-dired and nerd-icons-completion at the moment
This commit is contained in:
Evie Litherland-Smith 2024-08-12 07:31:15 +01:00
parent d7650100b2
commit 9ddb445963

View file

@ -107,35 +107,17 @@ 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))))
(add-to-list 'package-selected-packages 'all-the-icons)
(add-to-list 'package-selected-packages 'all-the-icons-dired)
(add-to-list 'package-selected-packages 'all-the-icons-ibuffer)
(add-to-list 'package-selected-packages 'all-the-icons-completion)
(use-package all-the-icons
:if (package-installed-p 'all-the-icons))
(use-package all-the-icons-dired
:if (package-installed-p 'all-the-icons-dired)
:after all-the-icons
:hook (dired-mode))
(use-package all-the-icons-ibuffer
:if (package-installed-p 'all-the-icons-ibuffer)
:after all-the-icons
:hook (ibuffer-mode))
(use-package all-the-icons-completion
:if (package-installed-p 'all-the-icons-completion)
:after (all-the-icons marginalia-mode)
:hook (marginalia-mode . all-the-icons-completion-marginalia-setup))
(add-to-list 'package-selected-packages 'nerd-icons) (add-to-list 'package-selected-packages 'nerd-icons)
(add-to-list 'package-selected-packages 'nerd-icons-corfu)
(use-package nerd-icons (use-package nerd-icons
:if (package-installed-p 'nerd-icons)) :if (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)
:after nerd-icons
:hook (ibuffer-mode))
(add-to-list 'package-selected-packages 'nerd-icons-corfu)
(use-package nerd-icons-corfu (use-package nerd-icons-corfu
:if (package-installed-p 'nerd-icons-corfu) :if (package-installed-p 'nerd-icons-corfu)
:after nerd-icons) :after nerd-icons)
@ -1071,7 +1053,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)
@ -1079,25 +1061,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"))