Fix icon loading

Move org-agenda-clocking face config to my/load-theme-and-configure

Remove loading from custom file
This commit is contained in:
Evie Litherland-Smith 2024-08-16 13:36:43 +01:00
parent 0605c45d09
commit 2fe6837307

View file

@ -87,13 +87,14 @@ Configure the look and feel of Emacs
(base16-theme-distinct-fringe-background nil) (base16-theme-distinct-fringe-background nil)
(base16-theme-highlight-mode-line 'contrast)) (base16-theme-highlight-mode-line 'contrast))
(defvar base16-current-theme-colors nil
"Set to `base16-*-theme-colors' for currently selected theme.")
(defun my/load-theme-and-configure () (defun my/load-theme-and-configure ()
"Load theme and configure some faces." "Load theme and configure some faces."
(interactive) (interactive)
(require 'base16-theme) (require 'base16-theme)
(load-theme 'base16-one-light t) (load-theme 'base16-one-light t)
(defvar base16-current-theme-colors nil
"Set to `base16-*-theme-colors' for currently selected theme.")
(setq base16-current-theme-colors base16-one-light-theme-colors) (setq base16-current-theme-colors base16-one-light-theme-colors)
;; Change outline headers to follow rainbow order ;; Change outline headers to follow rainbow order
@ -108,7 +109,12 @@ Configure the look and feel of Emacs
(outline-8 . :base0F))) (outline-8 . :base0F)))
(set-face-attribute (car pairing) nil (set-face-attribute (car pairing) nil
:foreground :foreground
(plist-get base16-current-theme-colors (cdr pairing))))) (plist-get base16-current-theme-colors (cdr pairing))))
;; Lighten org-agenda-clocking background to be more legible
(require 'org-faces)
(set-face-attribute 'org-agenda-clocking nil :background
(plist-get base16-current-theme-colors :base01)))
(require 'server) (require 'server)
(add-hook 'after-init-hook (add-hook 'after-init-hook
@ -118,31 +124,26 @@ Configure the look and feel of Emacs
(add-to-list 'package-selected-packages 'nerd-icons) (add-to-list 'package-selected-packages 'nerd-icons)
(use-package nerd-icons (use-package nerd-icons
:if (and (display-graphic-p) :if (package-installed-p 'nerd-icons))
(package-installed-p 'nerd-icons)))
(add-to-list 'package-selected-packages 'nerd-icons-ibuffer) (add-to-list 'package-selected-packages 'nerd-icons-ibuffer)
(use-package nerd-icons-ibuffer (use-package nerd-icons-ibuffer
:if (and (display-graphic-p) :if (package-installed-p 'nerd-icons-ibuffer)
(package-installed-p 'nerd-icons-ibuffer))
:after nerd-icons :after nerd-icons
:hook (ibuffer-mode)) :hook (ibuffer-mode))
(add-to-list 'package-selected-packages 'nerd-icons-corfu) (add-to-list 'package-selected-packages 'nerd-icons-corfu)
(use-package nerd-icons-corfu (use-package nerd-icons-corfu
:if (and (display-graphic-p) :if (package-installed-p 'nerd-icons-corfu)
(package-installed-p 'nerd-icons-corfu))
:after nerd-icons) :after nerd-icons)
(add-to-list 'package-selected-packages 'all-the-icons) (add-to-list 'package-selected-packages 'all-the-icons)
(use-package all-the-icons (use-package all-the-icons
:if (and (display-graphic-p) :if (package-installed-p 'all-the-icons))
(package-installed-p 'all-the-icons)))
(add-to-list 'package-selected-packages 'all-the-icons-dired) (add-to-list 'package-selected-packages 'all-the-icons-dired)
(use-package all-the-icons-dired (use-package all-the-icons-dired
:if (and (display-graphic-p) :if (package-installed-p 'all-the-icons-dired)
(package-installed-p 'all-the-icons-dired))
:after all-the-icons :after all-the-icons
:functions (all-the-icons-dired-mode) :functions (all-the-icons-dired-mode)
:hook (dired-mode . (lambda () (all-the-icons-dired-mode +1)))) :hook (dired-mode . (lambda () (all-the-icons-dired-mode +1))))
@ -632,11 +633,6 @@ Configure email with iCalendar event support, to integrate with
#+end_src #+end_src
*** IRC *** IRC
** Other ** Other
** Load custom file
#+begin_src emacs-lisp
(when (and custom-file (file-exists-p custom-file))
(load custom-file nil 'nomessage))
#+end_src
** Initial copy from =init.el= ** Initial copy from =init.el=
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package pixel-scroll (use-package pixel-scroll
@ -883,11 +879,7 @@ Configure email with iCalendar event support, to integrate with
(set-face-attribute 'org-verbatim nil :inherit 'org-code) (set-face-attribute 'org-verbatim nil :inherit 'org-code)
;; Let quote and verse blocks use variable-pitch font, if configured ;; Let quote and verse blocks use variable-pitch font, if configured
(set-face-attribute 'org-quote nil :inherit 'variable-pitch) (set-face-attribute 'org-quote nil :inherit 'variable-pitch)
(set-face-attribute 'org-verse nil :inherit 'variable-pitch) (set-face-attribute 'org-verse nil :inherit 'variable-pitch))
;; Lighten org-agenda-clocking background to be more legible
(require 'base16-theme)
(set-face-attribute 'org-agenda-clocking nil :background
(plist-get base16-current-theme-colors :base01)))
(use-package org-keys (use-package org-keys
:after org :after org