Update Emacs, Kitty and Vim Catppuccin themes

The Emacs theme saw the most development, no longer uses autothemer, and
exposes a few new Customize variables.

1 files changed, 8 insertions, 13 deletions

diff --git a/tw/home/files/emacs-init.el b/tw/home/files/emacs-init.el
index e7098b34..ce386b76 100644
--- a/tw/home/files/emacs-init.el
+++ b/tw/home/files/emacs-init.el
@@ -95,19 +95,14 @@
 ;; Look and feel
 (set-face-attribute 'default nil :family "Hermit" :height 100)
 
-(use-package autothemer
-  ;; The "catppuccin" theme is linked to the appropriate variant by guix home.
-  :config (load-theme 'catppuccin-mocha t))
-
-(defun tw/get-catppuccin-color (name)
-  "Get the hex code of the Catppuccin color named NAME."
-  (cl-loop for color in (autothemer--theme-colors autothemer-current-theme)
-           when (string= (autothemer--color-name color) name)
-           return (autothemer--color-value color)))
-
-(custom-set-faces
- `(cursor ((default :background ,(tw/get-catppuccin-color "rosewater"))) t
-          "Make the cursor \"rosewater\", as recommended by Catppuccin upstream, overriding catppuccin/emacs."))
+(use-package catppuccin-theme
+  :commands (catppuccin-reload catppuccin-get-color)
+  :load-path "./"
+  :custom
+  (catppuccin-flavor 'mocha "Use the darkest Catppuccin theme.")
+  (catppuccin-italic-comments t "Make comments italic.  It looks nicer.")
+  (catppuccin-italic-variables t "Make variable names italic.  It looks nicer.")
+  :config (catppuccin-reload))
 
 (use-package smart-mode-line
   :hook (after-init . sml/setup)