2 files changed, 33 insertions, 19 deletions
diff --git a/home/dav/default.nix b/home/dav/default.nix
index 1706963..956ea71 100644
--- a/home/dav/default.nix
+++ b/home/dav/default.nix
@@ -7,21 +7,19 @@
       primaryCollection = null; # Set to a specific collection name if needed (e.g., "calendar") when multiple exist
       remote = {
         type = "caldav";
-        url = "https://dav.tammi.cc/petri.hienonen@protonmail.com";
+        url = "https://dav.tammi.cc/petri.hienonen%40protonmail.com/2f799b52-3895-85b0-c2ec-dcd7e86f7073/";
         userName = "petri.hienonen@protonmail.com";
-        passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.radicale.path}";
+        passwordCommand = [
+          "${pkgs.coreutils}/bin/cat"
+          "${config.age.secrets.radicale.path}"
+        ];
       };
       local = {
         type = "filesystem";
         fileExt = ".ics";
       };
-      vdirsyncer = {
+      pimsync = {
         enable = true;
-        collections = null; # null syncs all discovered collections; alternatively, specify ["calendar", "tasks", "journal"]
-        metadata = [
-          "color"
-          "displayname"
-        ];
       };
       khal = {
         enable = true;
@@ -34,21 +32,19 @@
     accounts.radicale = {
       remote = {
         type = "carddav";
-        url = "https://dav.tammi.cc/petri.hienonen@protonmail.com";
+        url = "https://dav.tammi.cc/petri.hienonen%40protonmail.com/9fa208e5-d89a-dda5-bb59-f71f726b7866/";
         userName = "petri.hienonen@protonmail.com";
-        passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.radicale.path}";
+        passwordCommand = [
+          "${pkgs.coreutils}/bin/cat"
+          "${config.age.secrets.radicale.path}"
+        ];
       };
       local = {
         type = "filesystem";
         fileExt = ".vcf";
       };
-      vdirsyncer = {
+      pimsync = {
         enable = true;
-        collections = null;
-        metadata = [
-          "color"
-          "displayname"
-        ];
       };
       khard = {
         enable = true;
@@ -58,8 +54,18 @@
   programs.khal.enable = true;
   programs.khard.enable = true;
   programs.todoman.enable = true; # For tasks (VTODO); uses the calendar basePath to discover task lists
-  services.vdirsyncer = {
+  programs.pimsync = {
+    enable = true;
+    settings = [
+      {
+        name = "status_path";
+        params = [ "${config.xdg.dataHome}/pimsync/status" ];
+      }
+    ];
+  };
+
+  services.pimsync = {
     enable = true;
-    frequency = "*:0/5"; # Sync every 5 minutes
+    verbosity = "info";
   };
 }
diff --git a/home/default.nix b/home/default.nix
index 8d911d6..37ee84e 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -39,6 +39,11 @@ in
     ./waybar
   ];
 
+  home.file = {
+    "Calendar/radicale/.keep".text = "";
+    "Contacts/radicale/.keep".text = "";
+  };
+
   age = {
     identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
     secrets = {
@@ -49,7 +54,10 @@ in
       openai_auth_token.file = ../secrets/openai_auth_token.age;
       relesoft_cargo_token.file = ../secrets/relesoft_cargo_token.age;
       shiori_password.file = ../secrets/shiori_password.age;
-      radicale.file = ../secrets/radicale.age;
+      radicale = {
+        path = "${config.home.homeDirectory}/.secrets/radicale";
+        file = ../secrets/radicale.age;
+      };
       unsplash_access_key.file = ../secrets/unsplash_access_key.age;
       gmail = {
         file = ../secrets/gmail.age;