Merge branch 'master' of /home/git/repositories/dotfiles

* 'master' of /home/git/repositories/dotfiles: (60 commits)
  .config/systemd/user/default.target.wants/*: Deleting all user services. Not good to have them started as root.
  export.zsh: Don't use /run/user/ directory for roots TMUX_TMPDIR.
  .irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule).
  .gitignore: Adding some now unneeded stuff that will popup from time to time.
  .zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1
  .irssi: Updating .irssi submodule to latest commit.
  .vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
  .vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
  termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
  pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
  .tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
  .compton.conf: Adding MPlayer to comptons exclude lists.
  Updating irssi settings.
  .autorandr/*: Clean slate for all autorandr profiles.
  .password-store: Updating password store to latest commits.
  .gitignore: Removing some unneeded stuff that has been added to the repo.
  fonts.conf: Updating to a correct path structure.
  .fonts: Removing top level configuration.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  ...

1 files changed, 20 insertions, 17 deletions

diff --git a/.config/khal/khal.conf b/.config/khal/khal.conf
index 0284874..7931720 100644
--- a/.config/khal/khal.conf
+++ b/.config/khal/khal.conf
@@ -1,30 +1,34 @@
 #/etc/khal/khal.conf.sample
 [calendars]
-[[pool]]
-path = ~/.calendars/pool
-readonly = True
+[[unix-pool]]
+path = ~/.calendars/unix-pool
 color = dark magenta
 
-[[private]]
-path = ~/.calendars/private
+[[concerts]]
+path = ~/.calendars/concerts
+color = brown
+
+[[birthdays]]
+path = ~/.calendars/contact_birthdays
 readonly = True
-color = dark cyan
+color = white
 
 [[courses]]
 path = ~/.calendars/courses
-readonly = True
-color = brown
-
-[[frqrec]]
-path = ~/.calendars/frqrec
-readonly = True
-color = brown
+color = light red
 
 [[d228]]
-path = ~/.calendars/room
-readonly = True
+path = ~/.calendars/d228
 color = dark green
 
+[[live]]
+path = ~/.calendars/live
+color = light green
+
+[[private]]
+path = ~/.calendars/private
+color = dark cyan
+
 [sqlite]
 path = ~/.config/khal/khal.db
 
@@ -37,10 +41,9 @@ dateformat = %d.%m.
 longdateformat = %d.%m.%Y
 datetimeformat =  %d.%m. %H:%M
 longdatetimeformat = %d.%m.%Y %H:%M
-
 firstweekday = 0
+weeknumbers = left
 
 [default]
 default_command = agenda
 default_calendar = private
-debug = 0