Give catppuccin themes proper revision numbers

2 files changed, 29 insertions, 35 deletions

diff --git a/tw/packages/catppuccin.scm b/tw/packages/catppuccin.scm
index 994efb0a..b2644147 100644
--- a/tw/packages/catppuccin.scm
+++ b/tw/packages/catppuccin.scm
@@ -134,7 +134,7 @@ Cursors with a Catppuccin palettes.")
   (package
     (name (string-append "catppuccin-" program "-theme"))
     ;; See info '(guix)Version Numbers' for advice.
-    (version (git-version "0.0.0" "1" commit))
+    (version (git-version "0.0.0" revision commit))
     (home-page (string-append "https://github.com/catppuccin/" program))
     (source
      (origin
@@ -150,9 +150,18 @@ Cursors with a Catppuccin palettes.")
 Catppuccin color palette."))
     (license license)))
 
+(define-public catppuccin-aerc-theme
+  (catppuccin-theme-package
+   #:program "aerc"
+   #:revision "23"   ; total number of commits since repo beginning
+   #:commit "c077726d2833852f324d1b2bd5b7f4be02ce0978"
+   #:repo-hash "1z3sfx1q8qw56pai1pxc55d86v31xx9vkh1g5sr4i5hhk8db92l9"
+   #:install-plan '(("dist/" "share/catppuccin/aerc/"))))
+
 (define-public catppuccin-dunst-theme
   (catppuccin-theme-package
    #:program "dunst"
+   #:revision "7"   ; total number of commits since repo beginning
    #:commit "a72991e56338289a9fce941b5df9f0509d2cba09"
    #:repo-hash "12gidkxw7kkalhn9rflki2f4wcd2flmrz2m9rzynmfawwqm95dyl"
    #:install-plan '(("src/" "share/catppuccin/dunst/"))))
@@ -161,9 +170,9 @@ Catppuccin color palette."))
   (catppuccin-theme-package
    #:program "emacs"
    #:version "0.2.0-alpha"
-   #:revision "86"
-   #:commit "b778bb48be7111e19f27dc99891b515074496f82"
-   #:repo-hash "1nynlmwdzy1mgzx4jg3c7llffk19hixzk7bbsk6m1zhxgnsickqh"
+   #:revision "90"
+   #:commit "1e9bdb0c19bf13c27a32b1adeabcace45fcbfd15"
+   #:repo-hash "1cv46rqdd159plnqdkl74zwcgmbndq81d02g41a327hdwbpahp6v"
    #:install-plan '(("catppuccin-theme.el" "share/catppuccin/emacs/"))))
 
 (define-public catppuccin-kde-theme
@@ -180,21 +189,15 @@ Catppuccin color palette."))
 (define-public catppuccin-kitty-theme
   (catppuccin-theme-package
    #:program "kitty"
-   #:commit "4820b3ef3f4968cf3084b2239ce7d1e99ea04dda"
-   #:repo-hash "11gp5j3jgvy681d3x369312k2vpc5bgmnvgiwzznywdkzgwv355r"
+   #:commit "d7d61716a83cd135344cbb353af9d197c5d7cec1"
+   #:revision "59"   ; total number of commits since repo beginning
+   #:repo-hash "0cr244zwh46vgjw2i6j53f6n02gc48ry6s0xmna91f0zipxml4cr"
    #: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"
+   #:revision "7"   ; total number of commits since repo beginning
    #:commit "be3d0ee1ba0fc26baf7a47c2aa7032b7541deb0f"
    #:repo-hash "04ib4lvma5959n943f7myzbc2blmb8n2dd7bkb0xgl2rnpfx2fvk"
    #:install-plan '(("themes/" "share/catppuccin/newsboat/"))))
@@ -202,13 +205,15 @@ Catppuccin color palette."))
 (define-public catppuccin-polybar-theme
   (catppuccin-theme-package
    #:program "polybar"
-   #:commit "9ee66f83335404186ce979bac32fcf3cd047396a"
-   #:repo-hash "040igkhrsgghrp5ni7zhglws3n8q6j7nc571d6gsvc9zr20d4ikd"
+   #:revision "9"   ; total number of commits since repo beginning
+   #:commit "989420b24e1f651b176c9d6083ad7c3b90a27f8b"
+   #:repo-hash "0wvshs5f54h0nfzf7pjwdhmj6xcngxqqvaqzxa3w5j7sk89nmwyr"
    #:install-plan '(("themes/" "share/catppuccin/polybar/"))))
 
 (define-public catppuccin-rofi-theme
   (catppuccin-theme-package
    #:program "rofi"
+   #:revision "43"   ; total number of commits since repo beginning
    #:commit "5350da41a11814f950c3354f090b90d4674a95ce"
    #:repo-hash "15phrl9qlbzjxmp29hak3a5k015x60w2hxjif90q82vp55zjpnhc"
    #:install-plan '(("basic/.local/share/rofi/themes/" "share/catppuccin/rofi/"))))
@@ -216,6 +221,7 @@ Catppuccin color palette."))
 (define-public catppuccin-vim-theme
   (catppuccin-theme-package
    #:program "vim"
+   #:revision "39"   ; total number of commits since repo beginning
    #:commit "be4725cfc3fb6ed96f706d9d1bd5baa24d2b048c"
    #:repo-hash "1mhrch0ck3g1gs79c6mlbj2krhqqk7hp5g0v7ahap71bcfk5yxk7"
    #:install-plan '(("colors/" "share/catppuccin/vim/colors/")
@@ -224,13 +230,7 @@ Catppuccin color palette."))
 (define-public catppuccin-zathura-theme
   (catppuccin-theme-package
    #:program "zathura"
-   #:commit "d85d8750acd0b0247aa10e0653998180391110a4"
-   #:repo-hash "1hv9wzjyg34533qaxc5dc3gy8fcyvpvzcri2aip1kf4varnpcn75"
+   #:revision "37"   ; total number of commits since repo beginning
+   #:commit "1bda9d8274dd327b7931886ef0c5c1eb33903814"
+   #:repo-hash "104qmrmb249ly2zp797m652bgsvs09q22p65a73lz0fmv7k9qqqx"
    #:install-plan '(("src/" "share/catppuccin/zathura/"))))
-
-(define-public catppuccin-aerc-theme
-  (catppuccin-theme-package
-   #:program "aerc"
-   #:commit "c077726d2833852f324d1b2bd5b7f4be02ce0978"
-   #:repo-hash "1z3sfx1q8qw56pai1pxc55d86v31xx9vkh1g5sr4i5hhk8db92l9"
-   #:install-plan '(("dist/" "share/catppuccin/aerc/"))))
diff --git a/tw/theme.scm b/tw/theme.scm
index a5dce5df..a6837e2d 100644
--- a/tw/theme.scm
+++ b/tw/theme.scm
@@ -29,11 +29,10 @@
 ;; https://github.com/catppuccin/catppuccin).
 (define-public catppuccin-background-color "1e1e2e")
 
-(define-public catppuccin-muttrc
-  (file-append catppuccin-neomutt-theme
-               (if (string=? catppuccin-theme-variant "latte")
-                   "/share/catppuccin/neomutt/latte-neomuttrc"
-                   "/share/catppuccin/neomutt/neomuttrc")))
+(define-public catppuccin-aerc
+  (file-append catppuccin-aerc-theme
+               (string-append "/share/catppuccin/aerc/catppuccin-"
+                              catppuccin-theme-variant)))
 
 (define-public catppuccin-newsboat
   (file-append catppuccin-newsboat-theme
@@ -96,8 +95,3 @@
   (file-append catppuccin-zathura-theme
                (string-append "/share/catppuccin/zathura/catppuccin-"
                               catppuccin-theme-variant)))
-
-(define-public catppuccin-aerc
-  (file-append catppuccin-aerc-theme
-               (string-append "/share/catppuccin/aerc/catppuccin-"
-                              catppuccin-theme-variant)))