X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=97282b29467627b73fe42ae1694754943f558e09;hb=76f56dfca564e0d2d6307d8b6e6a20368c240170;hp=155fa6d3e1d947b911b5911a7803e8cda05db90b;hpb=07dc43a8049adad53113b2244f8c94dbeb487b74;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 155fa6d..97282b2 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,7 +15,6 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-conflict_resolution = a wins
 collections = ["default"]
 
 [storage contacts_local]
@@ -25,7 +24,7 @@ fileext = .vcf
 
 [storage contacts_remote]
 type = carddav
-url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
+url = https://cal.martlubbers.net/card.php/addressbooks/mart
 auth = digest
 username = mart
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
@@ -34,7 +33,6 @@ 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]
@@ -44,11 +42,30 @@ fileext = .ics
 
 [storage calendar_remote]
 type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
+url = https://cal.martlubbers.net/cal.php/calendars/mart
 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://cal.martlubbers.net/cal.php/calendars/mart2
+auth = digest
+username = mart2
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
 # UNI
 [pair uni]
 a = uni_local