diff options
| author | David Runge <dave@sleepmap.de> | 2015-03-25 16:29:07 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-03-25 16:29:07 +0100 |
| commit | 32e8f95bb412d6f61afdd18836976061635378e5 (patch) | |
| tree | c0e6e65d7c5aa46ce942001051b0c35e97391283 /.zsh.after | |
| parent | 6867bda2d82e01c1daf81ee4b39443ecc6609694 (diff) | |
| parent | a0ef42e0a70ac6264835ba77936d1ba5bf2294fe (diff) | |
| download | dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.gz dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.bz2 dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.xz dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.zip | |
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.
...
Diffstat (limited to '.zsh.after')
| -rw-r--r-- | .zsh.after/export.zsh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh index 1c1453d..a602d79 100644 --- a/.zsh.after/export.zsh +++ b/.zsh.after/export.zsh @@ -27,3 +27,19 @@ export _JAVA_OPTIONS='-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndF # Java non-reparenting windows _JAVA_AWT_WM_NONREPARENTING=1; export _JAVA_AWT_WM_NONREPARENTING + +# GnuPG +export GPG_TTY=$(tty) + +# ssh-agent setting for use with gpg-agent +unset SSH_AGENT_PID +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh" +fi + +# Explicitely starting gpg-agent in the background +gpgconf --launch gpg-agent + +if [[ $UID -ne 0 ]]; then + export TMUX_TMPDIR="/run/user/$UID/tmux/" +fi |