diff options
| author | David Runge <dave@sleepmap.de> | 2018-01-17 15:24:50 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2018-01-17 15:24:50 +0100 |
| commit | 34cf0f6a25acc2482974ea2c00047750dc4961a1 (patch) | |
| tree | 94f943f33276061994a8fd1e981fc7683ec8b85e | |
| parent | e606ccf019345c3d1bb26524034eec94a10fad26 (diff) | |
| parent | dbafefda4802124cde4b4fc757ddf7361e41a2e1 (diff) | |
| download | dotfiles-34cf0f6a25acc2482974ea2c00047750dc4961a1.tar.gz dotfiles-34cf0f6a25acc2482974ea2c00047750dc4961a1.tar.bz2 dotfiles-34cf0f6a25acc2482974ea2c00047750dc4961a1.tar.xz dotfiles-34cf0f6a25acc2482974ea2c00047750dc4961a1.zip | |
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles:
.gitignore: Adding __pycache__ for qtile.
.config/khard/khard.conf: Adding wedding address book.
.config/khal/config: Adding back live calendar with light magenta color.
.vdirsyncer/config: Adding wedding address book. Adding back live calendar.
| -rw-r--r-- | .config/khal/config | 4 | ||||
| -rw-r--r-- | .config/khard/khard.conf | 3 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .vdirsyncer/config | 4 |
4 files changed, 10 insertions, 2 deletions
diff --git a/.config/khal/config b/.config/khal/config index 6e80dc8..56a40aa 100644 --- a/.config/khal/config +++ b/.config/khal/config @@ -20,6 +20,10 @@ color = brown path = ~/.calendars/flat color = light blue +[[live]] +path = ~/.calendars/live +color = light magenta + [[private]] path = ~/.calendars/private color = dark cyan diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf index 12031c9..33f9793 100644 --- a/.config/khard/khard.conf +++ b/.config/khard/khard.conf @@ -3,6 +3,9 @@ [[contacts]] path = ~/.contacts/contacts +[[wedding]] +path = ~/.contacts/wedding + [general] editor = vim merge_editor = vimdiff @@ -150,6 +150,7 @@ packages/ .config/pulse/ .config/pure-data/ .config/q4wine +.config/qtile/__pycache__ .config/rncbc.org/ .config/rubyripper/ .config/smplayer diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 2d86e44..b014d15 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -5,7 +5,7 @@ status_path = "~/.vdirsyncer/status/" [pair dave_contacts] a = "dave_contacts_local" b = "dave_contacts_remote" -collections = ["contacts"] +collections = ["contacts", "wedding"] conflict_resolution = "b wins" [storage dave_contacts_local] @@ -23,7 +23,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de [pair dave_calendar] a = "dave_calendar_local" b = "dave_calendar_remote" -collections = ["concerts", "contact_birthdays", "flat", "private", "work"] +collections = ["concerts", "contact_birthdays", "live", "flat", "private", "work"] [storage dave_calendar_local] type = "filesystem" |