6 files changed, 12 insertions, 18 deletions
diff --git a/tw/home.scm b/tw/home.scm
index 4556ac2b..29d65007 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -305,7 +305,6 @@
    emacs-ivy
    ;; emacs-company emacs-company-quickhelp emacs-company-posframe
    emacs-corfu emacs-corfu-doc
-   emacs-autothemer  ; for catppuccin/emacs
    emacs-undo-tree
    emacs-aggressive-indent
    emacs-which-key
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)
diff --git a/tw/theme.scm b/tw/theme.scm
index 47a60bb8..f60b6433 100644
--- a/tw/theme.scm
+++ b/tw/theme.scm
@@ -47,8 +47,8 @@
               "dunst-theme.conf"))
 
 (define-public catppuccin-emacs-theme
-  (local-file #.(string-append "theme/catppuccin/emacs/catppuccin-"
-                               catppuccin-theme-variant "-theme.el")))
+  ;; Select the appropriate variant in Emacs.
+  (local-file "theme/catppuccin/emacs/catppuccin-theme.el"))
 
 (define-public catppuccin-kdeglobals
   (local-file #.(let ((variant (string-upcase catppuccin-theme-variant 0 1)))
@@ -56,12 +56,12 @@
                                  "/Catppuccin" variant ".colors"))))
 
 (define-public catppuccin-kitty-diff
-  (local-file #.(string-append "theme/catppuccin/kitty/diff-"
+  (local-file #.(string-append "theme/catppuccin/kitty/themes/diff-"
                                catppuccin-theme-variant ".conf")
               "kitty-diff-theme.conf"))
 
 (define-public catppuccin-kitty
-  (local-file #.(string-append "theme/catppuccin/kitty/"
+  (local-file #.(string-append "theme/catppuccin/kitty/themes/"
                                catppuccin-theme-variant ".conf")
               "kitty-theme.conf"))
 
diff --git a/tw/theme/catppuccin/emacs b/tw/theme/catppuccin/emacs
-Subproject b4be30de73aa295ab56a20c21dff07fba3dec05
+Subproject 130519df71878bde23602fc8453b501c6dbd8fd
diff --git a/tw/theme/catppuccin/kitty b/tw/theme/catppuccin/kitty
-Subproject 43b08da1e1168aff2edb74105f293a90b4567c4
+Subproject 4820b3ef3f4968cf3084b2239ce7d1e99ea04dd
diff --git a/tw/theme/catppuccin/vim b/tw/theme/catppuccin/vim
-Subproject cf186cffa9b3b896b03e94247ac4b56994a09e3
+Subproject be4725cfc3fb6ed96f706d9d1bd5baa24d2b048