Merge branch 'master' of sleepmap:dotfiles

* 'master' of sleepmap:dotfiles: (51 commits)
  .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.
  termite/config: Explicitly adding firefox as browser, so clickable URLs will work
  .Xresources: Removing double entry for background
  .rtorrent.rc: Adding rtorrent configuration file
  profile-cleaner.conf: Adding standard setting for profile cleaner (dark background)
  .config/mpd/folders: Adding default folders for mpd.
  shotwell: Adding symlink for configuration.
  .config/systemd: Adding current systemd --user setup.
  pavucontrol.ini: Adding standard window size
  ardour3: Adding configs for Ardour3.
  .tmux.conf: base-index is added properly with -g now.
  base.cfg: Terminology base settings update
  conky: Add top, right, bottom conky config.
  rollback-profile: Changing the backup location.
  ...

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