From d4a0c28d981f76a0dbebaa680c00e8b6e7ecc1d1 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 11 Oct 2016 10:12:23 +0200
Subject: [PATCH] Change khal config location, update todo list

---
 cal/.config/khal/{khal.conf => config} |  0
 cal/.config/todoman/todoman.conf       |  2 +-
 cal/.config/vdirsyncer/config          | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 rename cal/.config/khal/{khal.conf => config} (100%)

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
--- 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
--- 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
-- 
2.20.1