2 files changed, 15 insertions, 15 deletions
diff --git a/modules/communication/neomutt/account/flavors/gmail/.neomuttrc b/modules/communication/neomutt/account/flavors/gmail/.neomuttrc
index c87bba0..2106b65 100644
--- a/modules/communication/neomutt/account/flavors/gmail/.neomuttrc
+++ b/modules/communication/neomutt/account/flavors/gmail/.neomuttrc
@@ -1,2 +1,2 @@
-mailboxes =Inbox ="[Gmail]/Drafts" ="[Gmail]/Sent Mail" ="[Gmail]/Spam" ="[Gmail]/Trash"
+mailboxes =inbox =drafts =sent =spam =trash
 unset record
diff --git a/modules/communication/neomutt/account/flavors/gmail/default.nix b/modules/communication/neomutt/account/flavors/gmail/default.nix
index b0b7733..ea696b2 100644
--- a/modules/communication/neomutt/account/flavors/gmail/default.nix
+++ b/modules/communication/neomutt/account/flavors/gmail/default.nix
@@ -8,25 +8,25 @@
 {
   config = lib.mkIf (config.flavor == "gmail.com") {
     folders = {
-      inbox = lib.mkDefault "Inbox";
-      drafts = lib.mkDefault "[Gmail]/Drafts";
-      sent = lib.mkDefault "[Gmail]/Sent Mail";
-      trash = lib.mkDefault "[Gmail]/Trash";
+      inbox = lib.mkDefault "inbox";
+      drafts = lib.mkDefault "drafts";
+      sent = lib.mkDefault "sent";
+      trash = lib.mkDefault "trash";
     };
 
     mbsync = {
       create = lib.mkDefault "maildir";
-      patterns = lib.mkDefault [
-        "INBOX"
-        "[Gmail]/Drafts"
-        "[Gmail]/Sent Mail"
-        "[Gmail]/Spam"
-      ];
+      patterns = lib.mkDefault [ "INBOX" ];
+      folders.map = lib.mkDefault {
+        inbox = "INBOX";
+        drafts = "[Gmail]/Drafts";
+        sent = "[Gmail]/Sent Mail";
+        spam = "[Gmail]/Spam";
+        trash = "[Gmail]/Trash";
+      };
       extraConfig.channel = {
         Sync = lib.mkDefault "All";
         CopyArrivalDate = lib.mkDefault "yes";
-        Expunge = lib.mkDefault "Both";
-        SyncState = lib.mkDefault "*";
       };
     };
 
@@ -34,8 +34,8 @@
 
     notmuch.neomutt.virtual-mailboxes = lib.mkDefault [
       {
-        name = "All Mail";
-        query = "folder:${name}/Inbox or folder:\"${name}/[Gmail]/Sent Mail\"";
+        name = "all";
+        query = "folder:${name}/inbox or folder:\"${name}/sent\"";
       }
     ];
   };