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, 41 insertions, 69 deletions

diff --git a/.vdirsyncer/config b/.vdirsyncer/config
index 1b190f7..7f04a07 100644
--- a/.vdirsyncer/config
+++ b/.vdirsyncer/config
@@ -1,102 +1,74 @@
-# An example configuration for vdirsyncer.
+#An example configuration for vdirsyncer.
 # Optional parameters are commented out.
-
+# This file doesn't document all available parameters, see
+# http://vdirsyncer.readthedocs.org/ for the rest of them.
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
-status_path = ~/.vdirsyncer/status/
+status_path = "~/.vdirsyncer/status/"
+password_command = pass2vdirsyncer
 
 # CARDDAV
+
 [pair dave_contacts]
+
 # A `[pair <name>]` block defines two storages `a` and `b` that should be
 # synchronized. The definition of these storages follows in `[storage <name>]`
 # blocks. This is similar to accounts in OfflineIMAP.
 a = dave_contacts_local
 b = dave_contacts_remote
 
-# If you want to synchronize several addressbooks, calendars etc that share
-# the same storage location and differ only in a suffix to this location
-# (i.e., a subdirectory) you can use collections. The comma-separated values
-# in this parameter represent these subdirectories and are added as URL
-# segments or similar.
-
-# Together with the definition of the following two `[storage]` blocks below
-# in this example it means that
-#   - https://owncloud.example.com/remote.php/carddav/addressbooks/bob/default/
-#     will get synced with ~/.contacts/default/
-#   - https://owncloud.example.com/remote.php/carddav/addressbooks/bob/work/
-#     will get synced with ~/.contacts/work/
-
+# Synchronize all collections available on "side B" (in this case the server).
+# You need to run `vdirsyncer discover` if new calendars/addressbooks are added
+# on the server.
 # Omitting this parameter implies that the given path and URL in the
-# corresponding `[storage <name>]` blocks are already pointing to a
+# corresponding `[storage <name>]` blocks are already directly pointing to a
 # collection each.
-collections = akt,bands,funkhaus,personal,pool,restaurants,service,tu-berlin,venues
+#collections = ["from b"]
+collections = ["akt","bands","private","services","tu-berlin","unixpool", "venues"]
 
 # To resolve a conflict the following values are possible:
-#   `None` - abort when collisions occur (default)
-#   `a wins` - assume a's items to be more up-to-date
-#   `b wins` - assume b's items to be more up-to-date
-#conflict_resolution = None
+# `null` - abort when collisions occur (default)
+# `"a wins"` - assume a's items to be more up-to-date
+# `"b wins"` - assume b's items to be more up-to-date
+conflict_resolution = "b wins"
 
 [storage dave_contacts_local]
 # A storage references actual data on a remote server or on the local disk.
 # Similar to repositories in OfflineIMAP.
 type = filesystem
-path = ~/.contacts/
+path = "~/.contacts/"
 fileext = .vcf
-# Create the directory if it doesn't exist: `True` or `False`
-#create = True
-#encoding = utf-8
 
 [storage dave_contacts_remote]
 type = carddav
-read_only = True
-url = https://cloud.frqrec.com/remote.php/carddav/addressbooks/dave/
-verify = False
-# Auth types. If you know yours, set it explicitly for performance.
-# - basic
-# - digest
-# - guess (default)
-#auth = guess
-username = dave
-# The password can also be fetched from the system password storage or netrc
-#password =
+#url = https://owncloud.example.com/remote.php/carddav/
+url = https://cloud.sleepmap.de/remote.php/carddav/
+verify = "~/.certs/sleepmap.crt"
+#verify = false
 
-# CALDAV
-[pair dave_calendars]
-a = dave_calendars_local
-b = dave_calendars_remote
-collections = private,pool,frqrec,courses
-
-[storage dave_calendars_local]
-type = filesystem
-path = ~/.calendars/
-fileext = .ics
-
-[storage dave_calendars_remote]
-type = caldav
-read_only = True
-url = https://cloud.frqrec.com/remote.php/caldav/calendars/dave/
-verify = False
-#auth = guess
-username = dave
+#username =
+# The password can also be fetched from the system password storage, netrc or a
+# custom command. See http://vdirsyncer.readthedocs.org/en/stable/keyring.html
 #password =
+username = dave
 
 # CALDAV
-[pair funkhaus_calendars]
-a = funkhaus_calendars_local
-b = funkhaus_calendars_remote
-collections = room
-
-[storage funkhaus_calendars_local]
+[pair dave_calendar]
+a = dave_calendar_local
+b = dave_calendar_remote
+#collections = ["private", "work"]
+collections = ["contact_birthdays", "private", "unix-pool", "courses", "live", "concerts", "d228"]
+[storage dave_calendar_local]
 type = filesystem
-path = ~/.calendars/
+path = "~/.calendars/"
 fileext = .ics
-
-[storage funkhaus_calendars_remote]
+[storage dave_calendar_remote]
 type = caldav
-read_only = True
-url = https://cloud.frqrec.com/remote.php/caldav/calendars/funkhaus-d228/
-verify = False
-#auth = guess
-username = funkhaus-d228
+#url = https://owncloud.example.com/remote.php/caldav/
+url = https://cloud.sleepmap.de/remote.php/caldav/
+verify = "~/.certs/sleepmap.crt"
+#verify = false
+#username =
 #password =
+username = dave
+