Package Catppuccin themes instead of using git submodules

This makes administrating this repo easier, and the home environment can be
reconfigured without having to add the checkout to the guile load path.

1 files changed, 40 insertions, 34 deletions

diff --git a/tw/theme.scm b/tw/theme.scm
index f60b6433..83ce8270 100644
--- a/tw/theme.scm
+++ b/tw/theme.scm
@@ -15,59 +15,62 @@
 (define-module (tw theme)
   #:use-module (guix gexp)
   #:use-module ((guix modules)
-                #:select (source-module-closure)))
-
-(fluid-set! read-eval? #t)  ; allow #. read expansions in this file
+                #:select (source-module-closure))
+  #:use-module (tw packages catppuccin))
 
 ;; One of "latte" (light theme), "frappe", "macchiato", "mocha" (dark
 ;; themes); ordered brightest to darkest.
 ;; Set and use this at read time so that `local-file' gets a literal
 ;; argument. Anything else confuses it and causes it to search
 ;; relative to the working directory, not this file's directory.
-#.(define catppuccin-theme-variant "mocha")
+(define catppuccin-theme-variant "mocha")
 
 ;; "Base" colour from the active Catppuccin theme (see
 ;; https://github.com/catppuccin/catppuccin).
 (define-public catppuccin-background-color "1e1e2e")
 
 (define-public catppuccin-muttrc
-  (local-file #.(if (string=? catppuccin-theme-variant "latte")
-                    "theme/catppuccin/neomutt/latte-neomuttrc"
-                    "theme/catppuccin/neomutt/neomuttrc")))
+  (file-append catppuccin-neomutt-theme
+               (if (string=? catppuccin-theme-variant "latte")
+                   "/share/catppuccin/neomutt/latte-neomuttrc"
+                   "/share/catppuccin/neomutt/neomuttrc")))
 
 (define-public catppuccin-newsboat
-  (local-file #.(if (string=? catppuccin-theme-variant "latte")
-                    "theme/catppuccin/newsboat/themes/latte"
-                    "theme/catppuccin/newsboat/themes/dark")
-              "newsboat-theme.conf"))
+  (file-append catppuccin-newsboat-theme
+               (if (string=? catppuccin-theme-variant "latte")
+                   "/share/catppuccin/newsboat/latte"
+                   "/share/catppuccin/newsboat/dark")))
 
 (define-public catppuccin-dunstrc
-  (local-file #.(string-append "theme/catppuccin/dunst/src/"
-                               catppuccin-theme-variant ".conf")
-              "dunst-theme.conf"))
+  (file-append catppuccin-dunst-theme
+               (string-append "/share/catppuccin/dunst/"
+                              catppuccin-theme-variant ".conf")))
 
-(define-public catppuccin-emacs-theme
+(define-public catppuccin-emacs
   ;; Select the appropriate variant in Emacs.
-  (local-file "theme/catppuccin/emacs/catppuccin-theme.el"))
+  (file-append catppuccin-emacs-theme
+               "/share/catppuccin/emacs/catppuccin-theme.el"))
 
 (define-public catppuccin-kdeglobals
-  (local-file #.(let ((variant (string-upcase catppuccin-theme-variant 0 1)))
-                  (string-append "theme/catppuccin/kde/" variant
-                                 "/Catppuccin" variant ".colors"))))
+  (file-append catppuccin-kde-theme
+               (string-append "/share/color-schemes/Catppuccin"
+                              (string-upcase catppuccin-theme-variant 0 1)
+                              ".colors")))
 
 (define-public catppuccin-kitty-diff
-  (local-file #.(string-append "theme/catppuccin/kitty/themes/diff-"
-                               catppuccin-theme-variant ".conf")
-              "kitty-diff-theme.conf"))
+  (file-append catppuccin-kitty-theme
+               (string-append "/share/catppuccin/kitty/diff-"
+                              catppuccin-theme-variant ".conf")))
 
 (define-public catppuccin-kitty
-  (local-file #.(string-append "theme/catppuccin/kitty/themes/"
-                               catppuccin-theme-variant ".conf")
-              "kitty-theme.conf"))
+  (file-append catppuccin-kitty-theme
+               (string-append "/share/catppuccin/kitty/"
+                              catppuccin-theme-variant ".conf")))
 
 (define-public catppuccin-polybar
-  (local-file #.(string-append "theme/catppuccin/polybar/themes/"
-                               catppuccin-theme-variant ".ini")))
+  (file-append catppuccin-polybar-theme
+               (string-append "/share/catppuccin/polybar/"
+                              catppuccin-theme-variant ".ini")))
 
 (define-public catppuccin-rofi
   (computed-file "catppuccin.rasi"
@@ -75,18 +78,21 @@
                             '((guix build utils)))
       #~(begin
           (use-modules (guix build utils))
-          (copy-file #$(local-file #.(string-append
-                                      "theme/catppuccin/rofi/basic/.local/share/rofi/themes/catppuccin-"
-                                      catppuccin-theme-variant ".rasi"))
+          (copy-file #$(file-append catppuccin-rofi-theme
+                                    (string-append
+                                     "/share/catppuccin/rofi/catppuccin-"
+                                     catppuccin-theme-variant ".rasi"))
                      #$output)
           (substitute* #$output
             (("JetBrainsMono Nerd Font 14") "Fira Sans 12")            ; default font
             (("border-col: #[0-9a-f]*;") "border-col: #585b70;"))))))  ; i3 border colour
 
 (define-public catppuccin-vim
-  (local-file #.(string-append "theme/catppuccin/vim/colors/catppuccin_"
-                               catppuccin-theme-variant ".vim")))
+  (file-append catppuccin-vim-theme
+               (string-append "/share/catppuccin/vim/colors/catppuccin_"
+                              catppuccin-theme-variant ".vim")))
 
 (define-public catppuccin-zathura
-  (local-file #.(string-append "theme/catppuccin/zathura/src/catppuccin-"
-                               catppuccin-theme-variant)))
+  (file-append catppuccin-zathura-theme
+               (string-append "/share/catppuccin/zathura/catppuccin-"
+                              catppuccin-theme-variant)))