From b5d32d3962a84bdd4526f406084ff9eaabe61c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Thu, 8 Apr 2021 11:58:25 +0200
Subject: [PATCH] feat(khard): sync all calendars, dont deduce calendar from
 birthdays

---
 configs/khal.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/configs/khal.nix b/configs/khal.nix
index 8c6528d..30d6105 100644
--- a/configs/khal.nix
+++ b/configs/khal.nix
@@ -53,13 +53,8 @@ in
 
         [[kalender_local]]
         path = ${davHome}/calendar/*
-        color = 32
         type = discover
 
-        [[kontakte_local]]
-        path = ${davHome}/contacts/contacts/
-        type = birthdays
-
         [default]
         highlight_event_days = True
         timedelta = 5d
@@ -82,7 +77,7 @@ in
         [pair kontakte]
         a = "kontakte_local"
         b = "kontakte_cloud"
-        collections = ["from a", "from b"]
+        collections = ["contacts"]
         conflict_resolution = "b wins"
 
         [pair kalender]
@@ -103,13 +98,13 @@ in
 
         [storage kontakte_cloud]
         type = "carddav"
-        url = "${davEndpoint}/addressbooks/users/${username}/contacts/"
+        url = "${davEndpoint}/addressbooks/users/${username}/"
         username = "${username}"
         password = "${password}"
 
         [storage kalender_cloud]
         type = "caldav"
-        url = "${davEndpoint}/calendars/${username}/personal/"
+        url = "${davEndpoint}/calendars/${username}/"
         username = "${username}"
         password = "${password}"
       '';