diff options
| author | David Runge <dave@sleepmap.de> | 2016-08-16 16:05:08 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2016-08-16 16:05:08 +0200 |
| commit | 5398090beb583efb86717010f90ebdf2552c4b94 (patch) | |
| tree | a550fa866f8ba0c66296888031298582ff3781d3 /.vdirsyncer | |
| parent | a24212e200da85e91c20d3f7c6631a19b4bab04f (diff) | |
| parent | 30d3a2fdefce354b65019226ba1762b0403b8439 (diff) | |
| download | dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.gz dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.bz2 dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.tar.xz dotfiles-5398090beb583efb86717010f90ebdf2552c4b94.zip | |
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles: (28 commits)
.config/qtile/config.py: Disabling broken TreeTab layout. Adding scide to dev. Changing background picture to lowercase. Enabling notification widget.
.zsh.after/aliases.zsh: Adding automatic selection of audio backends for mpv.
bin/set_volume: Adding further increase/decrease shortcuts.
.scvimrc: Adding system runtimepath for .sc files.
.config/mpd/mpd-trvlr-jack.conf: Adding mpd configuration for trvlr using JACK.
.config/mpd/mpd-trvlr.conf: Adding mpd configuration for trlvr.
.config/mpd/mpd.conf: Switching audio backend to JACK in default mpd config.
.config/conky/side: Removing broken xft settings.
.config/compton.conf
.config/SuperCollider/startupfiles/rme_fireface800.scd: Removing obsolete configurations.
.config/SuperCollider/startup.scd: Adding a generic startupFile for SuperCollider.
.gitignore: Unignoring SuperCollider's startup file.
.processing/preferences.txt: Removing configuration due to constant regneration and metadata leakage.
.config/patchagerc: Removing useless configuration.
.config/SuperCollider/sc_ide_conf.yaml: Removing redundant sc_ide_conf.yaml.
.arduino/preferences.txt: Removing arduino preferences due to redundancy.
.scvimrc: Using horizontal split in tmux. Removing old trash from ftplugin identifiers. Using SClangStart only on scd files.
.config/gtk-3.0/gtk.css: Adding css to disable double drawing of menus/title bars and client-side decoration.
.config/compton.conf: Disabling fading (too slow). Lowering shadow-radius, so it won't interfere with WM bars.
.vdirsyncer/config: Adding 'b wins' conflict_resolution for akt.
...
Diffstat (limited to '.vdirsyncer')
| -rw-r--r-- | .vdirsyncer/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.vdirsyncer/config b/.vdirsyncer/config index f506d79..c183b0a 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -60,6 +60,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de a = akt_calendar_local b = akt_calendar_remote collections = ["ak_shared_by_mvoigt", "rechencluster_shared_by_mvoigt", "labs_shared_by_mvoigt", "akurlaub_shared_by_mvoigt", "grossesstudio_shared_by_mvoigt", "kleinesstudio_shared_by_mvoigt", "studioausleihe_shared_by_mvoigt", "studiotermine_shared_by_mvoigt"] +conflict_resolution = "b wins" [storage akt_calendar_local] type = filesystem |