From d170337c7ba5be5104428b0cba057876c1eb9d5e Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Mon, 25 Dec 2023 16:38:04 +0100
Subject: dav: Move calendars and contacts to XDG compliant dirs

Signed-off-by: David Runge <dave@sleepmap.de>
---
 .config/khal/config       | 24 ++++++++++++------------
 .config/khard/khard.conf  |  6 +++---
 .config/vdirsyncer/config |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.config/khal/config b/.config/khal/config
index f9f3a93..308b403 100644
--- a/.config/khal/config
+++ b/.config/khal/config
@@ -2,54 +2,54 @@
 
 # local
 [[local]]
-path = ~/.calendars/local
+path = ~/.local/state/vdirsyncer/calendars/local
 readonly = True
 color = 'light red'
 
 # cloud.sleepmap.de
 [[birthdays]]
-path = ~/.calendars/contact_birthdays
+path = ~/.local/state/vdirsyncer/calendars/contact_birthdays
 readonly = True
 color = 'white'
 
 [[concerts]]
-path = ~/.calendars/concerts
+path = ~/.local/state/vdirsyncer/calendars/concerts
 color = 'brown'
 
 [[flat]]
-path = ~/.calendars/flat
+path = ~/.local/state/vdirsyncer/calendars/flat
 color = 'light blue'
 
 [[live]]
-path = ~/.calendars/live
+path = ~/.local/state/vdirsyncer/calendars/live
 color = 'light magenta'
 
 [[private]]
-path = ~/.calendars/private
+path = ~/.local/state/vdirsyncer/calendars/private
 color = 'dark cyan'
 
 [[work]]
-path = ~/.calendars/work
+path = ~/.local/state/vdirsyncer/calendars/work
 color = 'dark red'
 
 [[t4]]
-path = ~/.calendars/bus_shared_by_t4
+path = ~/.local/state/vdirsyncer/calendars/bus_shared_by_t4
 color = 'dark cyan'
 
 [[nanni]]
-path = ~/.calendars/personal_shared_by_nanni
+path = ~/.local/state/vdirsyncer/calendars/personal_shared_by_nanni
 color = 'light magenta'
 
 [[work_nanni]]
-path = ~/.calendars/work_shared_by_nanni
+path = ~/.local/state/vdirsyncer/calendars/work_shared_by_nanni
 color = 'light magenta'
 
 [[fsf_nanni]]
-path = ~/.calendars/flanger-studio-four_shared_by_nanni
+path = ~/.local/state/vdirsyncer/calendars/flanger-studio-four_shared_by_nanni
 color = 'light magenta'
 
 [sqlite]
-path = ~/.local/share/khal/khal.db
+path = ~/.local/state/khal/khal.db
 
 [locale]
 local_timezone = Europe/Berlin
diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf
index 98a8362..8b1fc63 100644
--- a/.config/khard/khard.conf
+++ b/.config/khard/khard.conf
@@ -1,10 +1,10 @@
 [addressbooks]
 
 [[contacts]]
-path = ~/.contacts/contacts
+path = ~/.local/state/vdirsyncer/contacts/contacts
 
 [[wedding]]
-path = ~/.contacts/wedding
+path = ~/.local/state/vdirsyncer/contacts/wedding
 
 [general]
 editor = helix
@@ -20,4 +20,4 @@ show_uids = yes
 
 [vcard]
 preferred_version = 3.0
-private_objects = Jabber, Ring, Twitter
+private_objects = Matrix,Fediverse
diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index 74dda0f..14b803f 100644
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -10,7 +10,7 @@ conflict_resolution = "b wins"
 
 [storage dave_contacts_local]
 type = "filesystem"
-path = "~/.contacts/"
+path = "~/.local/state/vdirsyncer/contacts/"
 fileext = ".vcf"
 
 [storage dave_contacts_remote]
@@ -28,7 +28,7 @@ collections = ["concerts", "contact_birthdays", "live",  "flat", "private", "wor
 
 [storage dave_calendar_local]
 type = "filesystem"
-path = "~/.calendars/"
+path = "~/.local/state/vdirsyncer/calendars/"
 fileext = ".ics"
 
 [storage dave_calendar_remote]
@@ -45,7 +45,7 @@ collections = ["flanger-studio-four_shared_by_nanni", "work_shared_by_nanni"]
 
 [storage nanni_calendar_local]
 type = "filesystem"
-path = "~/.calendars/"
+path = "~/.local/state/vdirsyncer/calendars/"
 fileext = ".ics"
 
 [storage nanni_calendar_remote]
-- 
cgit v1.2.3-70-g09d2