Don't enable work accounts by default

Enable specifically on work laptop

home/accounts/calendar.nix

@@ -43,14 +43,8 @@
           type = "caldav";
           url = "http://localhost:1080/users/${userName}/calendar/";
         };
-        vdirsyncer = {
+        vdirsyncer.collections = [ "from a" ];
-          enable = false; # TEMP until fixed
+        khal.type = "discover";
-          collections = [ "from a" ];
-        };
-        khal = {
-          enable = false; # TEMP until fixed
-          type = "discover";
-        };
       };
     };
   };

home/accounts/contact.nix

@@ -34,10 +34,7 @@
           type = "carddav";
           url = "http://localhost:1080/users/${userName}/contacts/";
         };
-        vdirsyncer = {
+        vdirsyncer.collections = [ "from a" ];
-          enable = false; # TEMP until fixed
-          collections = [ "from a" ];
-        };
       };
     };
   };

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,15 +130,11 @@
           subFolders = "Verbatim";
           extraConfig.account.AuthMechs = "LOGIN";
         };
-        msmtp = {
+        msmtp.extraConfig = {
-          enable = true;
-          extraConfig = {
           tls = "off";
           auth = "login";
         };
       };
-        mu.enable = true;
-      };
     };
   };
 }

hosts/Ronin/home.nix

@@ -21,9 +21,24 @@
       "https://nucleus.ukaea.uk";
   };
   programs.mbsync.groups.inboxes.ukaea = [ "INBOX" ];
-  accounts.email.accounts = {
+  accounts = {
-    ukaea.primary = true;
+    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
   '';
 }