diff options
| author | David Runge <dave@sleepmap.de> | 2015-10-22 23:47:55 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-10-22 23:47:55 +0200 |
| commit | 3d7be9b249ddaff33cf363846578d429cfefd60a (patch) | |
| tree | a1d39dae5186d35beaee389e9508260d315686d9 /.vdirsyncer | |
| parent | 3fd1308ec86aa941bbed02c299ab5d57a48ee404 (diff) | |
| parent | 995892dc2105fa5c89b7f7ae32db46104b5c9e56 (diff) | |
| download | dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.tar.gz dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.tar.bz2 dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.tar.xz dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.zip | |
Merge branch 'master' of sleepmap.de:dotfiles
* 'master' of sleepmap.de:dotfiles:
.tmux.conf: Adding tmux > 2.1 mouse scrolling options.
.gitignore: Adding make/ folder to the list of ignored folder.
.gitignore: Adding bin/pass2offlineimapc, as it will be re-generated upon usage.
.gitignore: Adding .mutt/gpg-auto.rc, as it will have to be re-generated via script before useage of mutt.
bin/generate_pgp_auto: Adding script to generate mutt send-hooks for mail addresses with valid gpg keys, to be able to automatically send encrypted mail.
.mutt/gpg.rc: Updating correct settings for gpg.
.zsh.after/export.zsh: Fixing some typos and adding additional comments. Adding XDG_RUNTIME_DIR for tmux's TMUX_TMPDIR. Moving SSH_AUTH_SOCK to XDG_RUNTIME_DIR. Separating ssh-agent and gpg-agent again. Setting GPG_TTY to current tty. Setting GPG_AGENT_INFO to empty string, so gpg-agent can be found.
.config/khal/khal.conf, .vdirsyncer/config: Changing name of calendar.
.mutt/gpg.rc: Updating pgp settings to be compliant with gnupg > 2.1.
.local/share/applications/pd.desktop: Shifting from pd-extended to pd.
.tmux.conf: Adding new (post 2.1) mouse mode
Diffstat (limited to '.vdirsyncer')
| -rw-r--r-- | .vdirsyncer/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 2c81022..e2633af 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -60,7 +60,7 @@ username = dave [pair akt_calendar] a = akt_calendar_local b = akt_calendar_remote -collections = ["ak_shared_by_mvoigt", "studiotermine_shared_by_mvoigt", "rechencluster_shared_by_mvoigt", "labs_shared_by_mvoigt", "urlaub_shared_by_mvoigt", "grossesstudio_shared_by_mvoigt", "kleinesstudio_shared_by_mvoigt", "studioausleihe_shared_by_mvoigt", "studiotermine_shared_by_mvoigt"] +collections = ["ak_shared_by_mvoigt", "studiotermine_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"] [storage akt_calendar_local] type = filesystem |