From 751cb95bc24e600db00d82e487bdd41a9f4102ca Mon Sep 17 00:00:00 2001
From: Aner Zakobar <aner@zakobar.com>
Date: Fri, 2 May 2025 06:45:27 +0300
Subject: [PATCH] Mail in order

---
 modules/home-manager/mail.nix | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/modules/home-manager/mail.nix b/modules/home-manager/mail.nix
index 2cfba0a..e9221ad 100755
--- a/modules/home-manager/mail.nix
+++ b/modules/home-manager/mail.nix
@@ -6,11 +6,18 @@ let
   default_account_params = {
     realName = "Aner Zakobar";
     notmuch.enable = true;
+    mbsync = {
+        enable = true;
+        create = "maildir";
+    };
   };
-  default_lieer_params = default_account_params // {
-    lieer.enable = true;
-    lieer.sync.enable = true;
+  default_gmail_params = default_account_params // {
+    # lieer.enable = true;
+    # lieer.sync.enable = true;
     flavor = "gmail.com";
+    # imap = {
+    #     host = "mail.privateemail.com";
+    # };
   };
   default_smtp = {
     tls = {
@@ -33,7 +40,7 @@ in {
         notmuch = {
           enable = true;
           hooks = {
-            preNew = "mbsync -a && gmi sync";
+            preNew = "mbsync -a";
           };
         };
         mbsync = {
@@ -46,17 +53,18 @@ in {
           enable = true;
         };
       };
+      services.lieer.enable = true;
       accounts.email.accounts = {
-        gmail = default_lieer_params // {
+        gmail = default_gmail_params // {
           address = "anerisgreat@gmail.com";
           userName = "anerisgreat";
-          smtp = default_gmail_smtp;
-          passwordCommand = "pass gmail.com/mbsync-anerz";
+          # smtp = default_gmail_smtp;
+          passwordCommand = "pass gmail.com/mbsync-anerisgreat";
         };
-        bgu = default_lieer_params // {
+        bgu = default_gmail_params // {
           address = "anerz@post.bgu.ac.il";
           userName = "anerz@post.bgu.ac.il";
-          smtp = default_gmail_smtp;
+          # smtp = default_gmail_smtp;
           passwordCommand = "pass post.bgu.ac.il/mbsync-anerz";
         };
         zakobar = default_account_params // {
@@ -68,10 +76,10 @@ in {
           imap = {
             host = "mail.privateemail.com";
           };
-          mbsync = {
-              enable = true;
-              create = "maildir";
-          };
+          # mbsync = {
+          #     enable = true;
+          #     create = "maildir";
+          # };
 
           smtp = default_smtp // {
             port = 587;