X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=01919df3eb6ec6821ea384b239e98eb7bc42e56b;hb=HEAD;hp=91265d8e29aa30092ede6ff5040600cc7a1586cf;hpb=4b021b869204bbe0f663b748a7f66d94ef61ec9a;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 91265d8..01919df 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -4,46 +4,113 @@
 # Run `vdirsyncer --help` for CLI usage.
 #
 # Optional parameters are commented out.
-# This file doesn't document all available parameters, see
+# This file doesn"t document all available parameters, see
 # http://vdirsyncer.readthedocs.org/ for the rest of them.
 
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
-status_path = ~/.vdirsyncer/status/
+status_path = "~/.local/share/vdirsyncer/status/"
+#default_command = "sync"
+
+# Webcal
+[pair sws]
+a = "sws_web"
+b = "sws_remote"
+collections = null
+
+[storage sws_web]
+type = "http"
+url = "https://calendar.google.com/calendar/ical/673803b665fea319a9af80e9f39d3d7c3310200ca9db88ed073fa872f86a80e5%40group.calendar.google.com/public/basic.ics"
+
+[storage sws_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars/mart/sws/"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+[pair uni]
+a = "uni_web"
+b = "uni_remote"
+collections = null
+
+[storage uni_web]
+type = "http"
+url = "https://persoonlijkrooster.ru.nl/ical?612f428e&group=false&eu=VTUzMTE1OA==&h=fwIseCt7TiLdsmZedg33fpvCIrs00_mKW4-HN0jjCWA="
+
+[storage uni_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars/mart/uni/"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+[pair vuilnis]
+a = "vuilnis_web"
+b = "vuilnis_remote"
+collections = null
+
+[storage vuilnis_web]
+type = "http"
+url = "https://wasteapi.ximmio.com/api/CallIcal?cn=Gemeente%20Almere&x=53d8db94-7945-42fd-9742-9bbc71dbe4c1&ty=null&ua=11219&sd=2020-12-21&ed=2024-01-09&path=https://wasteapi.ximmio.com&ln=nl&nt=1130"
+
+[storage vuilnis_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars/mart/vuilnis/"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # CARDDAV
 [pair contacts]
-a = contacts_local
-b = contacts_remote
-
+a = "contacts_local"
+b = "contacts_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage contacts_local]
-type = filesystem
-path = ~/.vdirsyncer/card
-fileext = .vcf
+type = "filesystem"
+path = "~/.local/share/vdirsyncer/card"
+fileext = ".vcf"
 
 [storage contacts_remote]
-type = carddav
-url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
-auth = digest
-username = mart
+type = "carddav"
+url = "https://cal.martlubbers.net/dav.php/addressbooks"
+#auth = "digest"
+username = "mart"
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # CALDAV
 [pair calendar]
-a = calendar_local
-b = calendar_remote
-collections = ["default", "mart", "elvira", "vuilnis"]
+a = "calendar_local"
+b = "calendar_remote"
+collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage calendar_local]
-type = filesystem
-path = ~/.vdirsyncer/cal
-fileext = .ics
+type = "filesystem"
+path = "~/.local/share/vdirsyncer/cal"
+fileext = ".ics"
 
 [storage calendar_remote]
-type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
-auth = digest
-username = mart
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars"
+#auth = digest
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+# Tasks
+[pair tasks]
+a = "tasks_local"
+b = "tasks_remote"
+conflict_resolution = "a wins"
+collections = ["from b"]
+
+[storage tasks_local]
+type = "filesystem"
+path = "~/.local/share/vdirsyncer/tasks"
+fileext = ".ics"
+
+[storage tasks_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars"
+#auth = digest
+username = "task"
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]