small update

[dotfiles.git] / cal / .config / vdirsyncer / config

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index c610395..155fa6d 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -10,14 +10,13 @@
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
 status_path = ~/.vdirsyncer/status/
-password_command = pass show caldav_ygdrassil/mart
 
 # CARDDAV
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-
-collections = ["from b"]
+conflict_resolution = a wins
+collections = ["default"]
 
 [storage contacts_local]
 type = filesystem
@@ -29,11 +28,13 @@ type = carddav
 url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
 auth = digest
 username = mart
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # CALDAV
 [pair calendar]
 a = calendar_local
 b = calendar_remote
+conflict_resolution = a wins
 collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]
@@ -46,3 +47,19 @@ type = caldav
 url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
 auth = digest
 username = mart
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+# UNI
+[pair uni]
+a = uni_local
+b = uni_remote
+collections = null
+
+[storage uni_local]
+type = filesystem
+path = ~/.vdirsyncer/uni
+fileext = .ics
+
+[storage uni_remote]
+type = http
+url = "http://persoonlijkrooster.ru.nl/ical?57b59e14&eu=czQxMDk1MDM=&t=9d96e939-2d1b-4b49-b376-93937bc08725"