Cleanup theme setting, add some more mu4e context variables

This commit is contained in:
Evie Litherland-Smith 2024-06-06 17:26:46 +01:00
parent b60396f38c
commit cacdf85e11
2 changed files with 33 additions and 27 deletions

37
init.el
View file

@ -233,19 +233,20 @@
(advice-add command :after #'pulse-line)) (advice-add command :after #'pulse-line))
(use-package base16-theme (use-package base16-theme
:if (display-graphic-p) :demand
:defines base16-catppuccin-latte-theme-colors :defines (base16-catppuccin-latte-theme-colors
my/load-theme-and-configure)
:hook (server-after-make-frame . my/load-theme-and-configure)
:custom :custom
(base16-theme-distinct-fringe-background nil) (base16-theme-distinct-fringe-background nil)
(base16-theme-highlight-mode-line 'contrast) (base16-theme-highlight-mode-line 'contrast)
:config :init
(require 'font-lock) (defun my/load-theme-and-configure ()
(require 'outline) "Load theme and configure some faces."
(load-theme 'base16-catppuccin-latte t) (load-theme 'base16-catppuccin-latte t)
(dolist (face '(font-lock-doc-face
font-lock-comment-face ;; Change outline headers to follow rainbow order
font-lock-comment-delimiter-face)) (require 'outline)
(set-face-attribute face nil :foreground (plist-get base16-catppuccin-latte-theme-colors :base04)))
(dolist (pairing '((outline-1 . :base08) (dolist (pairing '((outline-1 . :base08)
(outline-2 . :base09) (outline-2 . :base09)
(outline-3 . :base0A) (outline-3 . :base0A)
@ -255,15 +256,13 @@
(outline-7 . :base0E) (outline-7 . :base0E)
(outline-8 . :base0F))) (outline-8 . :base0F)))
(set-face-attribute (car pairing) nil (set-face-attribute (car pairing) nil
:foreground (plist-get base16-catppuccin-latte-theme-colors (cdr pairing)))) :foreground
) (plist-get base16-catppuccin-latte-theme-colors (cdr pairing)))))
:config
(if (display-graphic-p) (my/load-theme-and-configure)))
(use-package nerd-icons (use-package nerd-icons
:functions (nerd-icons-set-font :functions (nerd-icons-octicon))
nerd-icons-octicon)
:if (display-graphic-p)
:config
(nerd-icons-set-font "Symbols Nerd Font Mono-12"))
(use-package nerd-icons-dired (use-package nerd-icons-dired
:diminish :diminish
@ -283,6 +282,7 @@
(use-package nerd-icons-corfu (use-package nerd-icons-corfu
:diminish :diminish
:functions nerd-icons-corfu-formatter
:requires (corfu nerd-icons) :requires (corfu nerd-icons)
:config (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)) :config (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
@ -706,7 +706,8 @@
(use-package corfu (use-package corfu
:defines (corfu-map :defines (corfu-map
corfu-mode-map) corfu-mode-map
corfu-margin-formatters)
:functions (corfu-mode :functions (corfu-mode
global-corfu-mode global-corfu-mode
corfu-history-mode) corfu-history-mode)
@ -997,7 +998,7 @@ Calls `project-remember-projects-under' for ~/Projects/"
("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user")))) ("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user"))))
(use-package treemacs (use-package treemacs
:functions treemacs :functions (treemacs treemacs-load-theme)
:bind (("M-g t" . treemacs-select-window)) :bind (("M-g t" . treemacs-select-window))
:hook (treemacs-mode . (lambda () :hook (treemacs-mode . (lambda ()
(visual-line-mode -1) (visual-line-mode -1)

View file

@ -77,7 +77,9 @@
(mu4e-sent-folder . "/Proton/Sent") (mu4e-sent-folder . "/Proton/Sent")
(mu4e-trash-folder . "/Proton/Trash") (mu4e-trash-folder . "/Proton/Trash")
(mu4e-refile-folder . "/Proton/Archive") (mu4e-refile-folder . "/Proton/Archive")
(gnus-icalendar-org-capture-headline . '("Email" "Personal"))
(message-cite-style . message-cite-style-thunderbird) (message-cite-style . message-cite-style-thunderbird)
(message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
)) ))
(make-mu4e-context (make-mu4e-context
:name "Alternate" :name "Alternate"
@ -87,7 +89,9 @@
(mu4e-sent-folder . "/iCloud/Sent Messages") (mu4e-sent-folder . "/iCloud/Sent Messages")
(mu4e-trash-folder . "/iCloud/Deleted Messages") (mu4e-trash-folder . "/iCloud/Deleted Messages")
(mu4e-refile-folder . "/iCloud/Archive") (mu4e-refile-folder . "/iCloud/Archive")
(gnus-icalendar-org-capture-headline . '("Email" "Personal"))
(message-cite-style . message-cite-style-thunderbird) (message-cite-style . message-cite-style-thunderbird)
(message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
)) ))
(make-mu4e-context (make-mu4e-context
:name "Work" :name "Work"
@ -97,6 +101,7 @@
(mu4e-sent-folder . "/Outlook/Sent") (mu4e-sent-folder . "/Outlook/Sent")
(mu4e-trash-folder . "/Outlook/Trash") (mu4e-trash-folder . "/Outlook/Trash")
(mu4e-refile-folder . "/Outlook/Archive") (mu4e-refile-folder . "/Outlook/Archive")
(gnus-icalendar-org-capture-headline . '("Email" "Work"))
(message-cite-style . message-cite-style-outlook) (message-cite-style . message-cite-style-outlook)
(message-signature . (concat "Evelyn Litherland-Smith (she/they)\n" (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"
"Spectroscopy Diagnostic Physicist\n" "Spectroscopy Diagnostic Physicist\n"