From 2ad36439c8195e97c0c04cabf3787db587874ec0 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 10 Oct 2023 10:20:43 +0100
Subject: [PATCH] Update work calendar setup

Sync new work calendar to fix duplicate issues
Sync old calendar as read-only ics link to see invited events
Re-enable vdirsyncer service for work machines
---
 home/accounts/calendar.nix | 23 +++++++++++++++++++++--
 hosts/Ronin/home.nix       |  6 ++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/home/accounts/calendar.nix b/home/accounts/calendar.nix
index d57d4d4b..c6598327 100644
--- a/home/accounts/calendar.nix
+++ b/home/accounts/calendar.nix
@@ -42,7 +42,8 @@
       ukaea = let emailConfig = config.accounts.email.accounts.ukaea;
       in rec {
         inherit local;
-        primaryCollection = "Calendar";
+        primary = lib.mkDefault false;
+        primaryCollection = "Work";
         remote = rec {
           inherit (emailConfig) userName passwordCommand;
           type = "caldav";
@@ -50,7 +51,7 @@
         };
         vdirsyncer = {
           enable = lib.mkDefault emailConfig.mbsync.enable;
-          collections = [ "calendar" ];
+          collections = [ "Work" ];
           metadata = [ "color" "displayname" ];
           itemTypes = [ "VEVENT" ];
         };
@@ -59,6 +60,24 @@
           type = "discover";
         };
       };
+      outlook = rec {
+        inherit local;
+        remote = {
+          type = "http";
+          url =
+            "https://outlook.office365.com/owa/calendar/57fac11ebefa4d76936bb57c58cea2c0@ukaea.uk/f00cf5046175418c881b15ae1734d35f4235780993826029606/S-1-8-4280276996-1465607807-3846002500-2142210095/reachcalendar.ics";
+        };
+        vdirsyncer = {
+          enable = true;
+          collections = null;
+        };
+        khal = {
+          inherit (vdirsyncer) enable;
+          color = "dark blue";
+          type = "calendar";
+          readOnly = true;
+        };
+      };
     };
   };
 }
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 5b9fc446..3c9a1318 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -12,9 +12,11 @@
       proton.primary = false;
       ukaea.primary = true;
     };
-    calendar.accounts.nextcloud.vdirsyncer.enable = false; # TEMP until fixed
+    calendar.accounts = {
+      nextcloud.primary = false;
+      ukaea.primary = true;
+    };
   };
-  services.vdirsyncer.enable = lib.mkForce false; # TEMP until fixed
   xdg.configFile."hypr/extra.conf".text = ''
     misc {
         disable_hyprland_logo = true