Use upstream aerc catppuccin theme

4 files changed, 13 insertions, 41 deletions

diff --git a/tw/home.scm b/tw/home.scm
index efa21344..14ae7b97 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -370,7 +370,7 @@ show_border=1
               ("aerc/aerc.conf" ,(local-file "home/files/aerc/aerc.conf"))
               ("aerc/binds.conf" ,(local-file "home/files/aerc/binds.conf"))
               ("aerc/filters" ,(local-file "home/files/aerc/filters" #:recursive? #t))
-              ("aerc/stylesets" ,(local-file "home/files/aerc/stylesets" #:recursive? #t))
+              ("aerc/stylesets/catppuccin" ,catppuccin-aerc)
               ("newsboat/config" ,(local-file "home/files/newsboat.conf"))
               ("newsboat/config.catppuccin" ,catppuccin-newsboat)
               ("vdirsyncer/config" ,(local-file "home/files/vdirsyncer.conf")))
diff --git a/tw/home/files/aerc/stylesets/catppuccin b/tw/home/files/aerc/stylesets/catppuccin
deleted file mode 100644
index 8e355691..00000000
--- a/tw/home/files/aerc/stylesets/catppuccin
+++ /dev/null
@@ -1,40 +0,0 @@
-*.selected.reverse = false
-*.selected.bg = #585b70
-error.fg = #eba0ac
-warning.fg = #fab387
-success.fg = #a6e3a1
-title.fg = default
-title.bold = true
-header.fg = #f5c2e7
-header.bold = true
-
-msglist_read.default = true
-msglist_unread.fg = #a6e3a1
-msglist_flagged.fg = #eba0ac
-msglist_flagged.bold = true
-msglist_deleted.fg = #f38ba8
-msglist_marked.fg = #f5e0dc
-
-dirlist_default.bg = #11111b
-dirlist_unread.fg = #a6e3a1
-dirlist_unread.bg = #11111b
-dirlist_recent.fg = #89dceb
-dirlist_recent.bg = #11111b
-
-tab.bg = #313244
-tab.selected.bold = true
-stack.bg = #6c7086
-spinner.fg = #fab387
-
-statusline_default.bg = #313244
-statusline_error.fg = #eba0ac
-statusline_error.bg = #313244
-statusline_success.fg = #a6e3a1
-statusline_success.bg = #313244
-
-completion_default.bg = #11111b
-# The "gutter" contains the scrollbar of the completion popup.
-completion_gutter.bg = #11111b
-# The "pill" is the part of the scrollbar that indicates progress
-# through the list.
-completion_pill.bg = #585b70
diff --git a/tw/packages/catppuccin.scm b/tw/packages/catppuccin.scm
index 38aade69..994efb0a 100644
--- a/tw/packages/catppuccin.scm
+++ b/tw/packages/catppuccin.scm
@@ -227,3 +227,10 @@ Catppuccin color palette."))
    #:commit "d85d8750acd0b0247aa10e0653998180391110a4"
    #:repo-hash "1hv9wzjyg34533qaxc5dc3gy8fcyvpvzcri2aip1kf4varnpcn75"
    #: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 83ce8270..a5dce5df 100644
--- a/tw/theme.scm
+++ b/tw/theme.scm
@@ -96,3 +96,8 @@
   (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)))