add vimpraat and update calendar stuff

diff --git a/cal/.config/khal/config b/cal/.config/khal/config
index 6ea0795..a0f27eb 100644 (file)
--- a/cal/.config/khal/config
+++ b/cal/.config/khal/config
@@ -8,7 +8,7 @@ path = ~/.vdirsyncer/cal/elvira
 color = light magenta
 
 [[default]]
-path = ~/.vdirsyncer/cal/default
+path = ~/.vdirsyncer/cal/calendar
 color = light blue
 
 [[vuilnis]]

diff --git a/cal/.config/khard/khard.conf b/cal/.config/khard/khard.conf
index 7cc3b0b..6fb1000 100644 (file)
--- a/cal/.config/khard/khard.conf
+++ b/cal/.config/khard/khard.conf
@@ -1,6 +1,6 @@
 [addressbooks]
 [[dav]]
-path = ~/.vdirsyncer/card/default
+path = ~/.vdirsyncer/card/addresses
 
 [general]
 editor = vim

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

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 97282b2..670e6aa 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,7 +15,7 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-collections = ["default"]
+collections = ["from b"]
 
 [storage contacts_local]
 type = filesystem
@@ -24,8 +24,8 @@ fileext = .vcf
 
 [storage contacts_remote]
 type = carddav
-url = https://cal.martlubbers.net/card.php/addressbooks/mart
-auth = digest
+url = https://cal.martlubbers.net/caldav.php/mart
+#auth = digest
 username = mart
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
@@ -33,7 +33,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 [pair calendar]
 a = calendar_local
 b = calendar_remote
-collections = ["default", "mart", "elvira", "vuilnis"]
+collections = ["from b"]
 
 [storage calendar_local]
 type = filesystem
@@ -42,17 +42,17 @@ fileext = .ics
 
 [storage calendar_remote]
 type = caldav
-url = https://cal.martlubbers.net/cal.php/calendars/mart
-auth = digest
+url = https://cal.martlubbers.net/caldav.php/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"]
+collections = ["from b"]
 
 [storage tasks_local]
 type = filesystem
@@ -61,9 +61,9 @@ fileext = .ics
 
 [storage tasks_remote]
 type = caldav
-url = https://cal.martlubbers.net/cal.php/calendars/mart2
-auth = digest
-username = mart2
+url = https://cal.martlubbers.net/caldav.php/task
+#auth = digest
+username = task
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # UNI