From 026d4e8596a1f0f67ca38793025c146c9252f801 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 2 Nov 2015 21:35:03 +0100
Subject: [PATCH] update for baikal

---
 .config/khal/khal.conf    |  2 +-
 .config/khard/khard.conf  |  2 +-
 .config/vdirsyncer/config | 10 ++++++----
 .mutt/muttrc              |  7 +++++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.config/khal/khal.conf b/.config/khal/khal.conf
index 3f4f544..bcad0c4 100644
--- a/.config/khal/khal.conf
+++ b/.config/khal/khal.conf
@@ -1,6 +1,6 @@
 [calendars]
 [[dav]]
-path = ~/.vdirsyncer/calendar/
+path = ~/.vdirsyncer/cal/default
 color = white
 
 [sqlite]
diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf
index d5838d9..7cc3b0b 100644
--- a/.config/khard/khard.conf
+++ b/.config/khard/khard.conf
@@ -1,6 +1,6 @@
 [addressbooks]
 [[dav]]
-path = ~/.vdirsyncer/addressbook/
+path = ~/.vdirsyncer/card/default
 
 [general]
 editor = vim
diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index 39e2b01..209a90b 100644
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -21,12 +21,13 @@ collections = ["from b"]
 
 [storage contacts_local]
 type = filesystem
-path = ~/.vdirsyncer/
+path = ~/.vdirsyncer/card
 fileext = .vcf
 
 [storage contacts_remote]
 type = carddav
-url = http://localhost:8008/addressbooks/users/mart/addressbook/
+url = https://ygdrassil.martlubbers.net/card.php/addressbooks/mart/default
+auth = digest
 username = mart
 
 # CALDAV
@@ -37,10 +38,11 @@ collections = ["from b"]
 
 [storage calendar_local]
 type = filesystem
-path = ~/.vdirsyncer/
+path = ~/.vdirsyncer/cal
 fileext = .ics
 
 [storage calendar_remote]
 type = caldav
-url = http://localhost:8008/calendars/users/mart/calendar/
+url = https://ygdrassil.martlubbers.net/cal.php/calendars/mart/default
+auth = digest
 username = mart
diff --git a/.mutt/muttrc b/.mutt/muttrc
index b6417e3..8036a9b 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -61,9 +61,12 @@ set tilde
 set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 
 # Aliases
-set query_command = "abook --mutt-query '%s'"
-macro index,pager a "<pipe-message>abook --add-email-quiet<return>" "Add this sender to Abook"
+set query_command= "khard mutt --search '%s'"
 bind editor <Tab> complete-query
+bind editor ^T    complete
+macro index,pager A \
+    "<pipe-message>khard add-email<return>" \
+    "add the sender email address to khard"
 
 # Colors
 color normal white default
-- 
2.20.1