From 9f58a1e4876815d1467a376d7b1fae0e4e8fe1ff Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 18 Jun 2016 19:21:46 +0200
Subject: [PATCH] vdirsyncer & khal

---
 .gitignore                  |  1 +
 Makefile                    |  4 ++++
 config/khal/khal.conf       | 11 +++++++++++
 config/vdirsyncer/config.m4 | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 config/khal/khal.conf
 create mode 100644 config/vdirsyncer/config.m4

diff --git a/.gitignore b/.gitignore
index c002c05..f077acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ i3/config
 i3status.conf
 mbsyncrc
 authinfo
+config/vdirsyncer/config
diff --git a/Makefile b/Makefile
index fa1854e..c54943d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ FILES = bashrc bash_profile vimrc zshrc gitconfig screenrc commonshrc liquidprom
 	gnomerc gvimrc muttrc pentadactylrc mailcap latexmkrc ctags \
 	i3/config i3status.conf msmtprc spacemacs emacs.d mbsyncrc authinfo \
 	config/qutebrowser config/nvim/init.vim ideavimrc agignore \
+	config/khal config/vdirsyncer/config \
 	$(wildcard sbt/0.13/*.sbt sbt/0.13/plugins/*.sbt)
 
 .PHONY: install clean check
@@ -41,6 +42,9 @@ install-vim-plug:
 	  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 	cp $(VIM_DIR)/autoload/plug.vim $(HOME)/.vim
 
+config/vdirsyncer/config: config/vdirsyncer/config.m4
+	umask 077; m4 $< >$@
+
 mbsyncrc: mbsyncrc.m4
 	umask 077; m4 $< >$@
 
diff --git a/config/khal/khal.conf b/config/khal/khal.conf
new file mode 100644
index 0000000..8294fa5
--- /dev/null
+++ b/config/khal/khal.conf
@@ -0,0 +1,11 @@
+[calendars]
+[[my_calendars_local]]
+path = ~/.calendars/
+type = discover
+
+[locale]
+timeformat = %H:%M
+dateformat = %Y-%m-%d
+longdateformat = %Y-%m-%d
+datetimeformat = %Y-%m-%d %H:%M
+longdatetimeformat = %Y-%m-%d %H:%M
diff --git a/config/vdirsyncer/config.m4 b/config/vdirsyncer/config.m4
new file mode 100644
index 0000000..f291da0
--- /dev/null
+++ b/config/vdirsyncer/config.m4
@@ -0,0 +1,36 @@
+[general]
+status_path = ~/.vdirsyncer/status/
+
+[pair my_calendars]
+a = my_calendars_local
+b = my_calendars_remote
+conflict_resolution = b wins
+collections = ["from b"]
+
+[storage my_calendars_local]
+type = filesystem
+path = ~/.calendars/
+fileext = .ics
+
+[storage my_calendars_remote]
+type = caldav
+url = "https://radicale.gebner.org/gebner/"
+username = gebner
+password = esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
+
+[pair my_contacts]
+a = my_contacts_local
+b = my_contacts_remote
+conflict_resolution = b wins
+collections = ["from b"]
+
+[storage my_contacts_local]
+type = filesystem
+path = ~/.contacts/
+fileext = .vcf
+
+[storage my_contacts_remote]
+type = carddav
+url = "https://radicale.gebner.org/gebner/"
+username = gebner
+password = esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')