From e2b1176e42ed97d1570fe66d8531794e9ecd11d2 Mon Sep 17 00:00:00 2001
From: wi11-holdsworth <83637728+wi11-holdsworth@users.noreply.github.com>
Date: Wed, 15 Oct 2025 22:03:44 +1100
Subject: [PATCH 1/2] refactor: enable aerc in aerc module instead of mail
 module

---
 modules/home-manager/features/aerc.nix | 1 -
 modules/home-manager/features/mail.nix | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/modules/home-manager/features/aerc.nix b/modules/home-manager/features/aerc.nix
index d2138bc..a79e1fa 100644
--- a/modules/home-manager/features/aerc.nix
+++ b/modules/home-manager/features/aerc.nix
@@ -10,7 +10,6 @@ in
   config = lib.mkIf config.${feature}.enable {
     programs.aerc = {
       enable = true;
-      extraConfig.general.unsafe-accounts-conf = true;
     };
   };
 
diff --git a/modules/home-manager/features/mail.nix b/modules/home-manager/features/mail.nix
index fac8d65..5bf57cd 100644
--- a/modules/home-manager/features/mail.nix
+++ b/modules/home-manager/features/mail.nix
@@ -32,9 +32,6 @@ in
             personal = {
               enable = true;
               # keep-sorted start block=yes
-              aerc = {
-                enable = true;
-              };
               imap = {
                 port = 1143;
                 inherit tls;
-- 
2.53.0


From 32b919f4d5b4b5e7c4c699aad8a3b169c9baa205 Mon Sep 17 00:00:00 2001
From: wi11-holdsworth <83637728+wi11-holdsworth@users.noreply.github.com>
Date: Wed, 15 Oct 2025 22:04:11 +1100
Subject: [PATCH 2/2] feat: add filters to aerc, catppuccin theme, and default
 folders

---
 modules/home-manager/features/aerc.nix | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/modules/home-manager/features/aerc.nix b/modules/home-manager/features/aerc.nix
index a79e1fa..5560061 100644
--- a/modules/home-manager/features/aerc.nix
+++ b/modules/home-manager/features/aerc.nix
@@ -8,8 +8,56 @@ let
 in
 {
   config = lib.mkIf config.${feature}.enable {
+    accounts.email.accounts.personal.aerc.enable = true;
     programs.aerc = {
       enable = true;
+      extraAccounts = {
+        default = "INBOX";
+        folders-sort = "INBOX, Starred, Drafts, Sent, Trash, Archive, Spam";
+      };
+      extraConfig = {
+        general.unsafe-accounts-conf = true;
+        filters = {
+          "text/plain" = "colorize";
+          "text/calendar" = "calendar | colorize";
+          "text/html" = "html | colorize";
+        };
+        ui = {
+          styleset-name = "catppuccin-mocha";
+          sort = "-r date";
+        };
+      };
+      stylesets = {
+        catppuccin-mocha = {
+          "*.default" = true;
+          "*.normal" = true;
+          "default.fg" = "#cdd6f4";
+          "error.fg" = "#f38ba8";
+          "warning.fg" = "#fab387";
+          "success.fg" = "#a6e3a1";
+          "tab.fg" = "#6c7086";
+          "tab.bg" = "#181825";
+          "tab.selected.fg" = "#cdd6f4";
+          "tab.selected.bg" = "#1e1e2e";
+          "tab.selected.bold" = true;
+          "border.fg" = "#11111b";
+          "border.bold" = true;
+          "msglist_unread.bold" = true;
+          "msglist_flagged.fg" = "#f9e2af";
+          "msglist_flagged.bold" = true;
+          "msglist_result.fg" = "#89b4fa";
+          "msglist_result.bold" = true;
+          "msglist_*.selected.bold" = true;
+          "msglist_*.selected.bg" = "#313244";
+          "dirlist_*.selected.bold" = true;
+          "dirlist_*.selected.bg" = "#313244";
+          "statusline_default.fg" = "#9399b2";
+          "statusline_default.bg" = "#313244";
+          "statusline_error.bold" = true;
+          "statusline_success.bold" = true;
+          "completion_default.selected.bg" = "#313244";
+        };
+      };
     };
   };
 
-- 
2.53.0