1 files changed, 79 insertions, 43 deletions
diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index b088c24..1210eb6 100644
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -2,65 +2,101 @@
 # A folder where vdirsyncer can store some metadata about each pair.
 status_path = "~/.local/state/vdirsyncer/status/"
 
-# CALDAV events
-[pair gnzler_calendars]
-a = "gnzler_calendar_local"
-b = "gnzler_calendar_remote"
-collections = null
-metadata = ["displayname", "color"]
-conflict_resolution = ["command", "nvim", "-d"]
-
-[storage gnzler_calendar_local]
+# STORAGE LOCAL
+[storage calendar_local]
 type = "filesystem"
 path = "~/calendars/personal/"
 fileext = ".ics"
-
-[storage gnzler_calendar_remote]
-type = "caldav"
-item_types = ["VEVENT"]
-url = "https://webmail.gandi.net/SOGo/dav/robert@gnzler.io/Calendar/personal/"
-username = "robert@gnzler.io"
-password.fetch = ["shell", "secretmenu -P 'gnzler.io mail' | head -n1"]
-
-
-# CALDAV tasks
-[pair gnzler_tasks]
-a = "gnzler_tasks_local"
-b = "gnzler_tasks_remote"
-collections = null
-metadata = ["displayname", "color"]
-conflict_resolution = ["command", "nvim", "-d"]
-
-[storage gnzler_tasks_local]
+[storage tasks_local]
 type = "filesystem"
 path = "~/calendars/tasks/"
 fileext = ".ics"
+[storage contacts_local]
+type = "filesystem"
+path = "~/contacts/"
+fileext = ".vcf"
 
-[storage gnzler_tasks_remote]
+# STORAGE GANDI
+[storage gandi_tasks_remote]
 type = "caldav"
 item_types = ["VTODO"]
 url = "https://webmail.gandi.net/SOGo/dav/robert@gnzler.io/Calendar/7F5F-63225280-C7-DF8F570/"
 username = "robert@gnzler.io"
-password.fetch = ["shell", "secretmenu -P 'gnzler.io mail' | head -n1"]
+password.fetch = ["shell", "rbw get 67436053-fde1-43c3-9544-6a5289f08c76"]
 
+# STORAGE MAILFENCE
+[storage mailfence_calendar_remote]
+type = "caldav"
+item_types = ["VEVENT"]
+url = "https://mailfence.com/dav/robertgzr/private/events"
+username = "robertgzr"
+password.fetch = ["shell", "rbw get 68b0ea26-733a-43cd-b8f8-e8ecc98de072"]
+[storage mailfence_contacts_remote]
+type = "carddav"
+url = "https://mailfence.com/dav/robertgzr/private/contacts"
+username = "robertgzr"
+password.fetch = ["shell", "rbw get 68b0ea26-733a-43cd-b8f8-e8ecc98de072"]
 
-# CARDDAV
-[pair gnzler_contacts]
-a = "gnzler_contacts_local"
-b = "gnzler_contacts_remote"
-collections = ["from a", "from b"]
+# STORAGE NEXTCLOUD
+[storage nx_calendar_remote]
+type = "caldav"
+item_types = ["VEVENT"]
+url = "https://nx.gzr.im/remote.php/dav/calendars/robert/personal/"
+username = "robert"
+password.fetch = ["shell", "rbw get bd753459-7a32-4876-b2fa-c082d59f6845"]
+[storage nx_tasks_remote]
+type = "caldav"
+item_types = ["VTODO"]
+url = "https://nx.gzr.im/remote.php/dav/calendars/robert/tasks/"
+username = "robert"
+password.fetch = ["shell", "rbw get bd753459-7a32-4876-b2fa-c082d59f6845"]
+[storage nx_contacts_remote]
+type = "carddav"
+url = "https://nx.gzr.im/"
+username = "robert"
+password.fetch = ["shell", "rbw get bd753459-7a32-4876-b2fa-c082d59f6845"]
 
+# PAIRS
+[pair mailfence_calendars]
+a = "calendar_local"
+b = "mailfence_calendar_remote"
+collections = null
+metadata = ["displayname", "color"]
+conflict_resolution = ["command", "nvim", "-d"]
+
+[pair gandi_tasks]
+a = "tasks_local"
+b = "gandi_tasks_remote"
+collections = null
+metadata = ["displayname", "color"]
+conflict_resolution = ["command", "nvim", "-d"]
+
+[pair mailfence_contacts]
+a = "contacts_local"
+b = "mailfence_contacts_remote"
+collections = [["personal", "personal", "contacts"]]
 # Synchronize the "display name" property into a local file (~/.contacts/displayname).
 metadata = ["displayname"]
+conflict_resolution = ["command", "nvim", "-d"]
 
-[storage gnzler_contacts_local]
-type = "filesystem"
-path = "~/contacts/"
-fileext = ".vcf"
+# [pair nx_calendars]
+# a = "calendar_local"
+# b = "nx_calendar_remote"
+# collections = null
+# metadata = ["displayname", "color"]
+# conflict_resolution = ["command", "nvim", "-d"]
 
-[storage gnzler_contacts_remote]
-type = "carddav"
-url = "https://webmail.gandi.net/SOGo/dav/robert@gnzler.io/Contacts/personal/"
-username = "robert@gnzler.io"
-password.fetch = ["shell", "secretmenu -P 'gnzler.io mail' | head -n1"]
+# [pair nx_tasks]
+# a = "tasks_local"
+# b = "nx_tasks_remote"
+# collections = null
+# metadata = ["displayname", "color"]
+# conflict_resolution = ["command", "nvim", "-d"]
 
+# [pair nx_contacts]
+# a = "contacts_local"
+# b = "nx_contacts_remote"
+# collections = [["personal", "personal", "contacts"]]
+# # Synchronize the "display name" property into a local file (~/.contacts/displayname).
+# metadata = ["displayname"]
+# conflict_resolution = ["command", "nvim", "-d"]