From a214815179291a173faea8af894d602c865726c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 28 Jan 2018 16:18:53 +0100
Subject: Update khal and khard and add vdirsyncer

---
 config/khal/config      | 14 +++++++-------
 config/khard/khard.conf | 12 ++++++++----
 install                 |  3 ++-
 mutt/muttrc             |  4 ++--
 private                 |  2 +-
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/config/khal/config b/config/khal/config
index 0addef1..bfbb9c7 100644
--- a/config/khal/config
+++ b/config/khal/config
@@ -6,20 +6,20 @@ timedelta = 10d
 [calendars]
 
 [[personal]]
-path = /home/cynerd/.khal/private
+path = /home/cynerd/.calendar/personal
 type = calendar
 color = dark blue
 
-[[school]]
-path = /home/cynerd/.khal/school
-type = calendar
-color = dark red
-
 [[work]]
-path = /home/cynerd/.khal/work
+path = /home/cynerd/.calendar/work
 type = calendar
 color = yellow
 
+[[misc]]
+path = /home/cynerd/.calendar/misc
+type = calendar
+color = dark red
+
 [highlight_days]
 default_color = dark gray
 method = background
diff --git a/config/khard/khard.conf b/config/khard/khard.conf
index 63bc685..1b4d7a2 100644
--- a/config/khard/khard.conf
+++ b/config/khard/khard.conf
@@ -1,11 +1,15 @@
 [addressbooks]
 
 [[family]]
-path = ~/.contacts/family/
+path = ~/.contacts/family
 [[friends]]
-path = ~/.contacts/friends/
-[[work]]
-path = ~/.contacts/work
+path = ~/.contacts/friends
+[[cz.nic]]
+path = ~/.contacts/cz.nic
+[[school]]
+path = ~/.contacts/school
+[[misc]]
+path = ~/.contacts/misc
 
 
 [general]
diff --git a/install b/install
index ce82066..cc7e8c3 100755
--- a/install
+++ b/install
@@ -91,9 +91,10 @@ if ask "Install desktop (i3..)"; then
 	inst config/user-dirs.dirs ~/.config/user-dirs.dirs
 fi
 
-if ask "Install khal khard"; then
+if ask "Install calendar and contacts"; then
 	inst config/khal/config ~/.config/khal/config
 	inst config/khard/khard.conf ~/.config/khard/khard.conf
+	inst private/vdirsyncer/ ~/.vdirsyncer
 fi
 
 if ask "Install Surf configuration"; then
diff --git a/mutt/muttrc b/mutt/muttrc
index 7ebfa2a..9e4d2d5 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -25,8 +25,8 @@ set crypt_autosign = yes
 set crypt_replyencrypt = yes
 set sendmail="/usr/bin/msmtp --read-envelope-from"
 
-set query_command= "abook --mutt-query '%s'"
-bind editor        <Tab> complete-query
+set query_command= "khard email --parsable '%s'"
+bind editor <Tab> complete-query
 
 macro index S 's=archive<enter>'
 
diff --git a/private b/private
index 572439b..3659803 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit 572439be1f36e6d83b410d08228b950699c242f8
+Subproject commit 365980335dc88f7782161d7f88fcbd4921c077c5
-- 
cgit v1.2.3