From c9456966bfd3c8181ac77e8e2014502076b5b947 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Tue, 9 Dec 2025 18:22:16 +0530
Subject: [PATCH] feat(email): enable mbsync and configure neomutt with sidebar
 and notmuch support

---
 home/accounts/fastmail.nix |  3 +++
 home/programs/default.nix  |  5 +++--
 home/programs/himalaya.nix |  6 +++---
 home/programs/neomutt.nix  | 17 ++++++++++++++---
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/home/accounts/fastmail.nix b/home/accounts/fastmail.nix
index 67049a23..b84d7477 100644
--- a/home/accounts/fastmail.nix
+++ b/home/accounts/fastmail.nix
@@ -35,5 +35,8 @@
       };
     };
   };
+  programs.mbsync.enable = true;
+  services.mbsync.enable = true;
+  # accounts.email.accounts.<name>.mbsync.create
   # services.mbsync.enable = true;
 }
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 60f9b18c..b59f3f86 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -21,10 +21,13 @@
     ./himalaya.nix
     ./mpd.nix
     ./ncpamixer.nix
+    ./neomutt.nix
+    ./neovim.nix
     ./nh.nix
     ./nix-index.nix
     ./nushell.nix
     ./omnix.nix
+    ./opencode.nix
     ./retroarch.nix
     ./rustup.nix
     ./ryujinx.nix
@@ -41,8 +44,6 @@
     ./yazi.nix
     ./yt-dlp.nix
     ./zoxide.nix
-    ./neovim.nix
-    ./opencode.nix
 
     # ./goread.nix
     # ./helix.nix
diff --git a/home/programs/himalaya.nix b/home/programs/himalaya.nix
index e30ab1b4..bb0a1c05 100644
--- a/home/programs/himalaya.nix
+++ b/home/programs/himalaya.nix
@@ -1,13 +1,13 @@
-{device, ...}: {
+{config, ...}: {
   programs.himalaya = {
     enable = true;
   };
   accounts.email.accounts.fastmail.himalaya = {
     enable = true;
     settings = {
-      downloads-dir = "${device.home}/Mail";
+      downloads-dir = "${config.home.homeDirectory}/Mail/fastmail";
       backend.type = "maildir";
-      backend.root-dir = "~/Mail";
+      backend.root-dir = "${config.home.homeDirectory}/Mail/fastmail";
     };
   };
 }
diff --git a/home/programs/neomutt.nix b/home/programs/neomutt.nix
index 00f36e42..49b5823d 100644
--- a/home/programs/neomutt.nix
+++ b/home/programs/neomutt.nix
@@ -1,9 +1,20 @@
 {pkgs, ...}: {
   programs.neomutt = {
-    enable = false;
+    enable = true;
     vimKeys = true;
     editor = "nvim";
-    # sidebar = {
-    # };
+    sidebar = {
+      enable = true;
+    };
+  };
+  programs.notmuch = {
+    enable = true;
+  };
+  accounts.email.accounts.fastmail.neomutt = {
+    enable = true;
+  };
+  accounts.email.accounts.fastmail.notmuch = {
+    enable = true;
+    neomutt.enable = true;
   };
 }