Re-enable vdirsyncer config for ukaea

home/accounts/calendar.nix

@@ -10,7 +10,7 @@
     basePath = ".calendar";
     accounts = {
       nextcloud = {
-        primary = true;
+        primary = lib.mkDefault true;
         primaryCollection = "Personal";
         local = {
           type = "filesystem";
@@ -28,16 +28,17 @@
           ];
         };
         vdirsyncer = {
-          enable = true;
+          enable = lib.mkDefault true;
           collections = [ "from a" ];
           metadata = [ "color" "displayname" ];
         };
         khal = {
-          enable = true;
+          enable = lib.mkDefault true;
           type = "discover";
         };
       };
       ukaea = {
+        primaryCollection = "Calendar";
         local = {
           type = "filesystem";
           fileExt = ".ics";
@@ -48,8 +49,16 @@
           type = "caldav";
           url = "http://localhost:1080/users/${userName}/calendar/";
         };
-        vdirsyncer.collections = [ "from a" ];
-        khal.type = "discover";
+        vdirsyncer = {
+          enable = lib.mkDefault true;
+          collections = [ "from a" ];
+          metadata = [ "color" "displayname" ];
+          itemTypes = [ "VEVENT" ];
+        };
+        khal = {
+          enable = lib.mkDefault true;
+          type = "discover";
+        };
       };
     };
   };

home/accounts/contact.nix

@@ -19,7 +19,7 @@
             "https://cloud.xenia.me.uk/remote.php/dav/addressbooks/users/xenia/contacts-1/";
         };
         vdirsyncer = {
-          enable = true;
+          enable = lib.mkDefault true;
           collections = [ "from a" ];
         };
       };
@@ -29,12 +29,15 @@
           fileExt = ".vcf";
         };
         remote = rec {
-          inherit (config.accounts.email.accounts.ukaea)
+          inherit (config.accounts.calendar.accounts.ukaea.remote)
             userName passwordCommand;
           type = "carddav";
           url = "http://localhost:1080/users/${userName}/contacts/";
         };
-        vdirsyncer.collections = [ "from a" ];
+        vdirsyncer = {
+          enable = lib.mkDefault true;
+          collections = [ "from a" ];
+        };
       };
     };
   };

hosts/Ronin/home.nix

@@ -26,11 +26,11 @@
       proton.primary = false;
       ukaea.primary = true;
     };
-    calendar.accounts.ukaea = {
+    calendar.accounts.nextcloud = {
       vdirsyncer.enable = false; # TEMP until fixed
       khal.enable = false; # TEMP until fixed
     };
-    contact.accounts.ukaea = {
+    contact.accounts.nextcloud = {
       vdirsyncer.enable = false; # TEMP until fixed
     };
   };