Merge branch 'master' into laptop

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

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index fb9ed33..91265d8 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -10,7 +10,6 @@
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
 status_path = ~/.vdirsyncer/status/
-password_command = pass show caldav_ygdrassil/mart
 
 # CARDDAV
 [pair contacts]
@@ -29,12 +28,13 @@ type = carddav
 url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
 auth = digest
 username = mart
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # CALDAV
 [pair calendar]
 a = calendar_local
 b = calendar_remote
-collections = ["from b"]
+collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]
 type = filesystem
@@ -46,3 +46,4 @@ type = caldav
 url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
 auth = digest
 username = mart
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]