X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=dd94fc2cac2dcb07267c2ca836aa8c39d4c9a61f;hb=69b452aa1bc04d987e4d1e6079cad122b967bcb2;hp=f52762c86e3a6caf6a3d8be64b130a579ff1fdb8;hpb=96e3462774dcc5a09ed9ef42e51276b204cf1d05;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index f52762c..dd94fc2 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -9,7 +9,7 @@
 
 [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"
 
 # CARDDAV
@@ -17,10 +17,11 @@ status_path = "~/.vdirsyncer/status/"
 a = "contacts_local"
 b = "contacts_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage contacts_local]
 type = "filesystem"
-path = "~/.vdirsyncer/card"
+path = "~/.local/share/vdirsyncer/card"
 fileext = ".vcf"
 
 [storage contacts_remote]
@@ -35,10 +36,11 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 a = "calendar_local"
 b = "calendar_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage calendar_local]
 type = "filesystem"
-path = "~/.vdirsyncer/cal"
+path = "~/.local/share/vdirsyncer/cal"
 fileext = ".ics"
 
 [storage calendar_remote]
@@ -47,37 +49,22 @@ 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 = "~/.vdirsyncer/tasks"
-#fileext = ".ics"
-#
-#[storage tasks_remote]
-#type = "caldav"
-#url = "https://cal.martlubbers.net/caldav.php/task"
-##auth = digest
-#username = "task"
-#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"
+
+# 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"]