Merge branch 'master' of github.com:dopefishh/dotfiles

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

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index bada49b..dd94fc2 100644 (file)
--- 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]
@@ -57,7 +59,7 @@ collections = ["from b"]
 
 [storage tasks_local]
 type = "filesystem"
-path = "~/.vdirsyncer/tasks"
+path = "~/.local/share/vdirsyncer/tasks"
 fileext = ".ics"
 
 [storage tasks_remote]