Change khal config location, update todo list

diff --git a/cal/.config/khal/khal.conf b/cal/.config/khal/config
similarity index 100%
rename from cal/.config/khal/khal.conf
rename to cal/.config/khal/config

diff --git a/cal/.config/todoman/todoman.conf b/cal/.config/todoman/todoman.conf
index ee89e59..c56991b 100644 (file)
--- a/cal/.config/todoman/todoman.conf
+++ b/cal/.config/todoman/todoman.conf
@@ -1,2 +1,2 @@
 [main]
-path = ~/.vdirsyncer/cal/default
+path = ~/.vdirsyncer/tasks/default

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 155fa6d..b80f300 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -49,6 +49,25 @@ 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