From 6bc0649fce542ef1eac6649d6507777aa035c41a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 30 Sep 2023 07:38:52 +0100
Subject: [PATCH] Don't enable work accounts by default

Enable specifically on work laptop
---
 home/accounts/calendar.nix | 10 ++--------
 home/accounts/contact.nix  |  5 +----
 home/accounts/email.nix    | 12 +++---------
 hosts/Ronin/home.nix       | 24 ++++++++++++++++++------
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/home/accounts/calendar.nix b/home/accounts/calendar.nix
index 4342a383..bc76dfe8 100644
--- a/home/accounts/calendar.nix
+++ b/home/accounts/calendar.nix
@@ -43,14 +43,8 @@
           type = "caldav";
           url = "http://localhost:1080/users/${userName}/calendar/";
         };
-        vdirsyncer = {
-          enable = false; # TEMP until fixed
-          collections = [ "from a" ];
-        };
-        khal = {
-          enable = false; # TEMP until fixed
-          type = "discover";
-        };
+        vdirsyncer.collections = [ "from a" ];
+        khal.type = "discover";
       };
     };
   };
diff --git a/home/accounts/contact.nix b/home/accounts/contact.nix
index beb96b06..c57a7ed9 100644
--- a/home/accounts/contact.nix
+++ b/home/accounts/contact.nix
@@ -34,10 +34,7 @@
           type = "carddav";
           url = "http://localhost:1080/users/${userName}/contacts/";
         };
-        vdirsyncer = {
-          enable = false; # TEMP until fixed
-          collections = [ "from a" ];
-        };
+        vdirsyncer.collections = [ "from a" ];
       };
     };
   };
diff --git a/home/accounts/email.nix b/home/accounts/email.nix
index 70d3eb18..9bbd4fc8 100644
--- a/home/accounts/email.nix
+++ b/home/accounts/email.nix
@@ -112,7 +112,6 @@
         passwordCommand = "${pkgs.pass}/bin/pass show Mail/Outlook/ukaea";
         userName = address;
         imapnotify = {
-          enable = true;
           boxes = [ "INBOX" ];
           onNotify = "${pkgs.isync}/bin/mbsync --pull ukaea:INBOX";
           onNotifyPost =
@@ -123,7 +122,6 @@
           };
         };
         mbsync = {
-          enable = true;
           create = "both";
           expunge = "both";
           remove = "both";
@@ -132,14 +130,10 @@
           subFolders = "Verbatim";
           extraConfig.account.AuthMechs = "LOGIN";
         };
-        msmtp = {
-          enable = true;
-          extraConfig = {
-            tls = "off";
-            auth = "login";
-          };
+        msmtp.extraConfig = {
+          tls = "off";
+          auth = "login";
         };
-        mu.enable = true;
       };
     };
   };
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 2f9bd1c7..38cf4d80 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -21,9 +21,24 @@
       "https://nucleus.ukaea.uk";
   };
   programs.mbsync.groups.inboxes.ukaea = [ "INBOX" ];
-  accounts.email.accounts = {
-    ukaea.primary = true;
-    proton.primary = false;
+  accounts = {
+    email.accounts = {
+      proton.primary = false;
+      ukaea = {
+        primary = true;
+        imapnotify.enable = true;
+        mbsync.enable = true;
+        msmtp.enable = true;
+        mu.enable = true;
+      };
+    };
+    calendar.accounts.ukaea = {
+      vdirsyncer.enable = false; # TEMP until fixed
+      khal.enable = false; # TEMP until fixed
+    };
+    contact.accounts.ukaea = {
+      vdirsyncer.enable = false; # TEMP until fixed
+    };
   };
   services.vdirsyncer.enable = lib.mkForce false; # TEMP until fixed
   services.kanshi.profiles = {
@@ -84,9 +99,6 @@
     monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1
     monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
 
-    windowrulev2 = nofullscreenrequest,title:(Zoom|zoom)
-    windowrulev2 = nomaximizerequest,title:(Zoom|zoom)
-
     exec-once = ${pkgs.davmail}/bin/davmail -notray
   '';
 }