2 files changed, 27 insertions, 45 deletions

diff --git a/lib/email.nix b/lib/email.nix
index e692d39..17ec44d 100644
--- a/lib/email.nix
+++ b/lib/email.nix
@@ -14,15 +14,12 @@ in
     email = {
       maildirBasePath = "${homedir}/Mail";
       accounts = {
-        "ben@bsima.me" = {
+        "ben@simatime.com" = {
           primary = true;
           realName = "Ben Sima";
           address = "ben@bsima.me";
           userName = "ben@simatime.com";
           alot.sendMailCommand = "${homedir}/bin/sendmail";
-          folders = {
-            inbox = "INBOX";
-          };
           imap = {
             host = "simatime.com";
             port = 993;
@@ -46,51 +43,24 @@ in
             expunge = "none";
           };
           notmuch.enable = true;
-          msmtp.enable = true;
-          passwordCommand = "cat ~/keybase/private/bsima/ben@bsima.me";
-        };
-
-        "ben@simatime.com" = {
-          realName = "Ben Sima";
-          address = "ben@simatime.com";
-          userName = "ben@simatime.com";
-          imap = {
-            host = "simatime.com";
-            port = 993;
-          };
-          smtp = {
-            host = "simatime.com";
-            port = 587;
-            tls = {
-              enable = true;
-              useStartTls = true;
-            };
-
-          };
-          mbsync = {
-            enable = true;
-            create = "both";
-            expunge = "none";
-          };
-          notmuch.enable = true;
           passwordCommand = "cat ~/keybase/private/bsima/ben@simatime.com";
           msmtp.enable = true;
         };
 
-        #"ben.sima@heroprojects.io" = {
-        #  flavor = "gmail.com";
-        #  realName = "Ben Sima";
-        #  address = "ben.sima@heroprojects.io";
-        #  userName = "ben.sima@heroprojects.io";
-        #  mbsync = {
-        #    enable = true;
-        #    create = "both";
-        #    expunge = "none";
-        #  };
-        #  notmuch.enable = true;
-        #  msmtp.enable = true;
-        #  passwordCommand = "pass work/hero/gmail";
-        #};
+        # "ben@heroprojects.io" = {
+        #   flavor = "gmail.com";
+        #   realName = "Ben Sima";
+        #   address = "ben@heroprojects.io";
+        #   userName = "ben@heroprojects.io";
+        #   mbsync = {
+        #     enable = true;
+        #     create = "both";
+        #     expunge = "none";
+        #   };
+        #   notmuch.enable = true;
+        #   msmtp.enable = true;
+        #   passwordCommand = "cat ~/keybase/private/bsima/ben@heroprojects.io";
+        # };
       };
     };
   };
diff --git a/linux.nix b/linux.nix
index 7dcef5c..9a24ee6 100644
--- a/linux.nix
+++ b/linux.nix
@@ -2,6 +2,7 @@
 
 let
   homedir = builtins.getEnv "HOME";
+  hostname = builtins.getEnv "HOSTNAME";
   gitCommitTemplate = ./lib/git-commit-template;
   gpgid = "D09299626FA78AF8";
   cmdtree = pkgs.stdenv.mkDerivation {
@@ -158,6 +159,12 @@ in
     kbfs.enable = true;
     keybase.enable = true;
 
+    mbsync = {
+      enable = true; #if hostname == "lithium" then true else false;
+      frequency = "*:0/15";
+      postExec = "${pkgs.notmuch}/bin/notmuch new";
+    };
+
     polybar = {
       # https://github.com/0x746866/dots/blob/master/polybar/config
       enable = true;
@@ -410,5 +417,10 @@ in
     rofi = {
       enable = true;
     };
+
+    notmuch = {
+      enable = true;
+      hooks.postNew = "${pkgs.afew}/bin/afew -tn && ${pkgs.afew}/bin/afew -t tag:inbox";
+    };
   };
 }