update to nextcloud calendar

home-modules/calendar.nix

@@ -2,27 +2,29 @@
   v = "nxc";
   user = "lennart";
   domain = hyper.domain;
-  calendars =  [
+  calendars = let
+    bs = "https://n.${domain}/remote.php/dav/calendars/lennart";
+  in [
     {
       name = "Preservation";
       primary = true;
-      url = "https://${v}.${domain}/${user}/calendars/preservation/";
+      url = "${bs}/preservation/";
       color = "#dddddd";
     }
     {
       name = "Effort";
-      url = "https://${v}.${domain}/${user}/calendars/effort/";
+      url = "${bs}/effort/";
       color = "#dd2222";
     }
     {
       name = "Experience";
-      url = "https://${v}.${domain}/${user}/calendars/experience/";
+      url = "${bs}/experience/";
       color = "#2222dd";
     }
     {
       name = "Leisure";
       # name = "Exposure";
-      url = "https://${v}.${domain}/${user}/calendars/leisure/";
+      url = "${bs}/leisure/";
       # url = "https://${v}.${domain}/${user}/exposure/";
       color = "#22aa22";
     }
@@ -32,11 +34,11 @@
     #   color = "#8800CC";
     # }
     # {
-    {
-      name = "Family";
-      url = "https://${v}.${domain}/shared/calendars/family/";
-      color = "#dddd22";
-    }
+    # {
+    #   name = "Family";
+    #   url = "${bs}/family/";
+    #   color = "#dddd22";
+    # }
     {
       name = "Sleep as Android";
       url = secrets.calendar.sleep-as-android-url;
@@ -79,7 +81,7 @@ in {
       inherit primary;
       remote = {
         inherit url name;
-        userName = hyper.user; # my globally set username
+        userName = user;
       };
     };
   in lib.attrsets.mergeAttrsList (