From cacdf85e11ac8331bdfe1cb5e71020fcb1e35b6e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Thu, 6 Jun 2024 17:26:46 +0100
Subject: [PATCH] Cleanup theme setting, add some more mu4e context variables

---
 init.el        | 55 +++++++++++++++++++++++++-------------------------
 mu4e-custom.el |  5 +++++
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/init.el b/init.el
index ea214fd..2f8a6f7 100644
--- a/init.el
+++ b/init.el
@@ -233,37 +233,36 @@
   (advice-add command :after #'pulse-line))
 
 (use-package base16-theme
-  :if (display-graphic-p)
-  :defines base16-catppuccin-latte-theme-colors
+  :demand
+  :defines (base16-catppuccin-latte-theme-colors
+            my/load-theme-and-configure)
+  :hook (server-after-make-frame . my/load-theme-and-configure)
   :custom
   (base16-theme-distinct-fringe-background nil)
   (base16-theme-highlight-mode-line 'contrast)
+  :init
+  (defun my/load-theme-and-configure ()
+    "Load theme and configure some faces."
+    (load-theme 'base16-catppuccin-latte t)
+
+    ;; Change outline headers to follow rainbow order
+    (require 'outline)
+    (dolist (pairing '((outline-1 . :base08)
+                       (outline-2 . :base09)
+                       (outline-3 . :base0A)
+                       (outline-4 . :base0B)
+                       (outline-5 . :base0C)
+                       (outline-6 . :base0D)
+                       (outline-7 . :base0E)
+                       (outline-8 . :base0F)))
+      (set-face-attribute (car pairing) nil
+                          :foreground
+                          (plist-get base16-catppuccin-latte-theme-colors (cdr pairing)))))
   :config
-  (require 'font-lock)
-  (require 'outline)
-  (load-theme 'base16-catppuccin-latte t)
-  (dolist (face '(font-lock-doc-face
-                  font-lock-comment-face
-                  font-lock-comment-delimiter-face))
-    (set-face-attribute face nil :foreground (plist-get base16-catppuccin-latte-theme-colors :base04)))
-  (dolist (pairing '((outline-1 . :base08)
-                     (outline-2 . :base09)
-                     (outline-3 . :base0A)
-                     (outline-4 . :base0B)
-                     (outline-5 . :base0C)
-                     (outline-6 . :base0D)
-                     (outline-7 . :base0E)
-                     (outline-8 . :base0F)))
-    (set-face-attribute (car pairing) nil
-                        :foreground (plist-get base16-catppuccin-latte-theme-colors (cdr pairing))))
-  )
+  (if (display-graphic-p) (my/load-theme-and-configure)))
 
 (use-package nerd-icons
-  :functions (nerd-icons-set-font
-              nerd-icons-octicon)
-  :if (display-graphic-p)
-  :config
-  (nerd-icons-set-font "Symbols Nerd Font Mono-12"))
+  :functions (nerd-icons-octicon))
 
 (use-package nerd-icons-dired
   :diminish
@@ -283,6 +282,7 @@
 
 (use-package nerd-icons-corfu
   :diminish
+  :functions nerd-icons-corfu-formatter
   :requires (corfu nerd-icons)
   :config (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
 
@@ -706,7 +706,8 @@
 
 (use-package corfu
   :defines (corfu-map
-            corfu-mode-map)
+            corfu-mode-map
+            corfu-margin-formatters)
   :functions (corfu-mode
               global-corfu-mode
               corfu-history-mode)
@@ -997,7 +998,7 @@ Calls `project-remember-projects-under' for ~/Projects/"
                             ("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user"))))
 
 (use-package treemacs
-  :functions treemacs
+  :functions (treemacs treemacs-load-theme)
   :bind (("M-g t" . treemacs-select-window))
   :hook (treemacs-mode . (lambda ()
                            (visual-line-mode -1)
diff --git a/mu4e-custom.el b/mu4e-custom.el
index 6f678b5..3d99ef7 100644
--- a/mu4e-custom.el
+++ b/mu4e-custom.el
@@ -77,7 +77,9 @@
                   (mu4e-sent-folder . "/Proton/Sent")
                   (mu4e-trash-folder . "/Proton/Trash")
                   (mu4e-refile-folder . "/Proton/Archive")
+                  (gnus-icalendar-org-capture-headline . '("Email" "Personal"))
                   (message-cite-style . message-cite-style-thunderbird)
+                  (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
                   ))
          (make-mu4e-context
           :name "Alternate"
@@ -87,7 +89,9 @@
                   (mu4e-sent-folder . "/iCloud/Sent Messages")
                   (mu4e-trash-folder . "/iCloud/Deleted Messages")
                   (mu4e-refile-folder . "/iCloud/Archive")
+                  (gnus-icalendar-org-capture-headline . '("Email" "Personal"))
                   (message-cite-style . message-cite-style-thunderbird)
+                  (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"))
                   ))
          (make-mu4e-context
           :name "Work"
@@ -97,6 +101,7 @@
                   (mu4e-sent-folder . "/Outlook/Sent")
                   (mu4e-trash-folder . "/Outlook/Trash")
                   (mu4e-refile-folder . "/Outlook/Archive")
+                  (gnus-icalendar-org-capture-headline . '("Email" "Work"))
                   (message-cite-style . message-cite-style-outlook)
                   (message-signature . (concat "Evelyn Litherland-Smith (she/they)\n"
                                                "Spectroscopy Diagnostic Physicist\n"