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, 130 insertions, 93 deletions

diff --git a/tw/packages/catppuccin.scm b/tw/packages/catppuccin.scm
index ae2675e3..38aade69 100644
--- a/tw/packages/catppuccin.scm
+++ b/tw/packages/catppuccin.scm
@@ -82,111 +82,148 @@ theme is based on the Colloid theme made by Vinceliuice.")
         (revision "1")
         (variant "Mocha-Dark"))
     (package
-     (name (string-append "catppuccin-" (string-downcase variant) "-cursors"))
-     ;; See info '(guix)Version Numbers' for advice.
-     (version (git-version "0.0.0" revision commit))
-     (source
-      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/catppuccin/cursors")
-             (commit commit)))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "0ay415131hw1zk6aplmhm3vdmrb0rjw6qxz2svagy325jrfd79fk"))))
-     (native-inputs (list bash-minimal coreutils findutils gawk gnu-make inkscape xcursorgen))
-     (build-system trivial-build-system)
-     (arguments
-      `(#:modules ((guix build utils))
-        #:builder
-        (begin
-          (use-modules (guix build utils))
-          (let ((source (assoc-ref %build-inputs "source"))
-                (out (assoc-ref %outputs "out")))
-            (setenv "PATH" (string-trim-right
-                            (apply string-append
-                                   (map (lambda (input)
-                                          (string-append (cdr input) "/bin:"))
-                                        %build-inputs))
-                            #\:))
-            (mkdir-p "src")
-            ;; Without pruning, there are 8832 .svgs to convert. This
-            ;; takes too long. Just keep the ones I actually want.
-            (for-each (lambda (item)
-                        (copy-recursively (string-append source "/" item) item))
-                      (list "AUTHORS" "LICENSE" "Makefile" "build.sh"
-                            "src/config" "src/_svgo.yml" "src/cursorList"
-                            (string-append "src/Catppuccin-" ,variant "-Cursors")))
-            (for-each make-file-writable (find-files (getcwd)))
-            (patch-shebang "build.sh")
-            (invoke "make")
-            (invoke "make" "install" (string-append "PREFIX=" out))
-            #t))))
-     (home-page "https://github.com/catppuccin/cursors")
-     (synopsis "Soothing pastel mouse cursors")
-     (description "Soothing pastel cursor theme using the Catppuccin
-color palette.  This project is just a modification of Volantes
-Cursors with a Catppuccin palettes.")
-     (license license:gpl2))))
-
-;; Based on the Arch package:
-;; https://github.com/archlinux/svntogit-community/blob/packages/kvantum/trunk/PKGBUILD
-
-;; Based on the "lightly-qt" AUR package:
-;; https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=lightly-qt
-;; lightly is now packaged by Guix upstream
-;; (define-public lightly
-;;   (package
-;;    (name "lightly")
-;;    (version "0.4.1")
-;;    (source
-;;     (origin
-;;      (method git-fetch)
-;;      (uri (git-reference
-;;            (url "https://github.com/Luwx/Lightly")
-;;            (commit (string-append "v" version))))
-;;      (file-name (git-file-name name version))
-;;      (sha256 (base32 "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk"))))
-;;    (build-system qt-build-system)  ; cmake-build-system should be fine too
-;;    (native-inputs
-;;     (list extra-cmake-modules qtbase-5 qtdeclarative-5 qtx11extras
-;;           kconfigwidgets kcoreaddons kdecoration kguiaddons
-;;           ki18n kiconthemes kwindowsystem
-;;           kde-frameworkintegration  ; optional; Required to use KStyle convenience functionalities in style
-;;           kcmutils                  ; optional; Required for lightly-settings5 application to build
-;;           kwayland                  ; optional
-;;           pkg-config))              ; optional
-;;    (home-page "https://github.com/Luwx/Lightly")
-;;    (synopsis "A modern style for qt applications")
-;;    (description "Lightly is a fork of breeze theme style that aims
-;; to be visually modern and minimalistic.")
-;;    (license license:gpl2+)))
-
-(define-public catppuccin-kde-theme
-  (let ((commit "494c8576b17626a7b2c7a43cec8e6133a5e9c482")
-        (revision "1"))
-    (package
-      (name "catppuccin-kde-theme")
+      (name (string-append "catppuccin-" (string-downcase variant) "-cursors"))
       ;; See info '(guix)Version Numbers' for advice.
       (version (git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/catppuccin/kde")
+               (url "https://github.com/catppuccin/cursors")
                (commit commit)))
          (file-name (git-file-name name version))
-         (sha256 (base32 "07wizfbr0w23546n2skf8c33nayzxv044spbwrprjmh8sy7v6m7w"))))
-      (build-system copy-build-system)
+         (sha256 (base32 "0ay415131hw1zk6aplmhm3vdmrb0rjw6qxz2svagy325jrfd79fk"))))
+      (native-inputs (list bash-minimal coreutils findutils gawk gnu-make inkscape xcursorgen))
+      (build-system trivial-build-system)
       (arguments
-       '(#:install-plan
-         '(("Frappe/CatppuccinFrappe.colors" "share/color-schemes/")
-           ("Latte/CatppuccinLatte.colors" "share/color-schemes/")
-           ("Macchiato/CatppuccinMacchiato.colors" "share/color-schemes/")
-           ("Mocha/CatppuccinMocha.colors" "share/color-schemes/")
-           ("LICENSE" "share/doc/catppuccin-kde-theme/"))))
+       `(#:modules ((guix build utils))
+         #:builder
+         (begin
+           (use-modules (guix build utils))
+           (let ((source (assoc-ref %build-inputs "source"))
+                 (out (assoc-ref %outputs "out")))
+             (setenv "PATH" (string-trim-right
+                             (apply string-append
+                                    (map (lambda (input)
+                                           (string-append (cdr input) "/bin:"))
+                                         %build-inputs))
+                             #\:))
+             (mkdir-p "src")
+             ;; Without pruning, there are 8832 .svgs to convert. This
+             ;; takes too long. Just keep the ones I actually want.
+             (for-each (lambda (item)
+                         (copy-recursively (string-append source "/" item) item))
+                       (list "AUTHORS" "LICENSE" "Makefile" "build.sh"
+                             "src/config" "src/_svgo.yml" "src/cursorList"
+                             (string-append "src/Catppuccin-" ,variant "-Cursors")))
+             (for-each make-file-writable (find-files (getcwd)))
+             (patch-shebang "build.sh")
+             (invoke "make")
+             (invoke "make" "install" (string-append "PREFIX=" out))
+             #t))))
       (home-page "https://github.com/catppuccin/cursors")
       (synopsis "Soothing pastel mouse cursors")
       (description "Soothing pastel cursor theme using the Catppuccin
 color palette.  This project is just a modification of Volantes
 Cursors with a Catppuccin palettes.")
       (license license:gpl2))))
+
+(define* (catppuccin-theme-package
+          #:key program commit (version "0.0.0") (revision "1")
+          (license license:expat) repo-hash install-plan)
+  (package
+    (name (string-append "catppuccin-" program "-theme"))
+    ;; See info '(guix)Version Numbers' for advice.
+    (version (git-version "0.0.0" "1" commit))
+    (home-page (string-append "https://github.com/catppuccin/" program))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference (url home-page) (commit commit)))
+       (file-name (git-file-name name version))
+       (sha256 (base32 repo-hash))))
+    (build-system copy-build-system)
+    (arguments
+     `(#:install-plan ',install-plan))
+    (synopsis (string-append "Soothing pastel theme for " program))
+    (description (string-append "Soothing pastel " program " theme using the
+Catppuccin color palette."))
+    (license license)))
+
+(define-public catppuccin-dunst-theme
+  (catppuccin-theme-package
+   #:program "dunst"
+   #:commit "a72991e56338289a9fce941b5df9f0509d2cba09"
+   #:repo-hash "12gidkxw7kkalhn9rflki2f4wcd2flmrz2m9rzynmfawwqm95dyl"
+   #:install-plan '(("src/" "share/catppuccin/dunst/"))))
+
+(define-public catppuccin-emacs-theme
+  (catppuccin-theme-package
+   #:program "emacs"
+   #:version "0.2.0-alpha"
+   #:revision "86"
+   #:commit "b778bb48be7111e19f27dc99891b515074496f82"
+   #:repo-hash "1nynlmwdzy1mgzx4jg3c7llffk19hixzk7bbsk6m1zhxgnsickqh"
+   #:install-plan '(("catppuccin-theme.el" "share/catppuccin/emacs/"))))
+
+(define-public catppuccin-kde-theme
+  (catppuccin-theme-package
+   #:program "kde"
+   #:commit "494c8576b17626a7b2c7a43cec8e6133a5e9c482"
+   #:repo-hash "07wizfbr0w23546n2skf8c33nayzxv044spbwrprjmh8sy7v6m7w"
+   #:license license:gpl2
+   #:install-plan '(("Frappe/CatppuccinFrappe.colors" "share/color-schemes/")
+                    ("Latte/CatppuccinLatte.colors" "share/color-schemes/")
+                    ("Macchiato/CatppuccinMacchiato.colors" "share/color-schemes/")
+                    ("Mocha/CatppuccinMocha.colors" "share/color-schemes/"))))
+
+(define-public catppuccin-kitty-theme
+  (catppuccin-theme-package
+   #:program "kitty"
+   #:commit "4820b3ef3f4968cf3084b2239ce7d1e99ea04dda"
+   #:repo-hash "11gp5j3jgvy681d3x369312k2vpc5bgmnvgiwzznywdkzgwv355r"
+   #:install-plan '(("themes/" "share/catppuccin/kitty/"))))
+
+(define-public catppuccin-neomutt-theme
+  (catppuccin-theme-package
+   #:program "neomutt"
+   #:commit "f6ce83da47cc36d5639b0d54e7f5f63cdaf69f11"
+   #:repo-hash "0v8hfv23vv70cgkd3qarizwx85ch9jbzi09jnir8abw3znf7mvf9"
+   #:install-plan '(("./" "share/catppuccin/neomutt/"
+                     #:include-regexp ("muttrc$")))))
+
+(define-public catppuccin-newsboat-theme
+  (catppuccin-theme-package
+   #:program "newsboat"
+   #:commit "be3d0ee1ba0fc26baf7a47c2aa7032b7541deb0f"
+   #:repo-hash "04ib4lvma5959n943f7myzbc2blmb8n2dd7bkb0xgl2rnpfx2fvk"
+   #:install-plan '(("themes/" "share/catppuccin/newsboat/"))))
+
+(define-public catppuccin-polybar-theme
+  (catppuccin-theme-package
+   #:program "polybar"
+   #:commit "9ee66f83335404186ce979bac32fcf3cd047396a"
+   #:repo-hash "040igkhrsgghrp5ni7zhglws3n8q6j7nc571d6gsvc9zr20d4ikd"
+   #:install-plan '(("themes/" "share/catppuccin/polybar/"))))
+
+(define-public catppuccin-rofi-theme
+  (catppuccin-theme-package
+   #:program "rofi"
+   #:commit "5350da41a11814f950c3354f090b90d4674a95ce"
+   #:repo-hash "15phrl9qlbzjxmp29hak3a5k015x60w2hxjif90q82vp55zjpnhc"
+   #:install-plan '(("basic/.local/share/rofi/themes/" "share/catppuccin/rofi/"))))
+
+(define-public catppuccin-vim-theme
+  (catppuccin-theme-package
+   #:program "vim"
+   #:commit "be4725cfc3fb6ed96f706d9d1bd5baa24d2b048c"
+   #:repo-hash "1mhrch0ck3g1gs79c6mlbj2krhqqk7hp5g0v7ahap71bcfk5yxk7"
+   #:install-plan '(("colors/" "share/catppuccin/vim/colors/")
+                    ("autoload/" "share/catppuccin/vim/autoload/"))))
+
+(define-public catppuccin-zathura-theme
+  (catppuccin-theme-package
+   #:program "zathura"
+   #:commit "d85d8750acd0b0247aa10e0653998180391110a4"
+   #:repo-hash "1hv9wzjyg34533qaxc5dc3gy8fcyvpvzcri2aip1kf4varnpcn75"
+   #:install-plan '(("src/" "share/catppuccin/zathura/"))))