X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=b80f300adb72eb371ee95e7f6ce071f1e5d6335c;hb=d4a0c28d981f76a0dbebaa680c00e8b6e7ecc1d1;hp=91265d8e29aa30092ede6ff5040600cc7a1586cf;hpb=ae833e18bdf78a15ff3db3c1c616ee5a0850273d;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 91265d8..b80f300 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,8 +15,8 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-
-collections = ["from b"]
+conflict_resolution = a wins
+collections = ["default"]
 
 [storage contacts_local]
 type = filesystem
@@ -34,6 +34,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 [pair calendar]
 a = calendar_local
 b = calendar_remote
+conflict_resolution = a wins
 collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]
@@ -47,3 +48,37 @@ url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
 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 = ["default"]
+
+[storage tasks_local]
+type = filesystem
+path = ~/.vdirsyncer/tasks
+fileext = .ics
+
+[storage tasks_remote]
+type = caldav
+url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart2/default
+auth = digest
+username = mart2
+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"