diff options
| author | David Runge <dave@sleepmap.de> | 2015-03-11 01:29:36 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-03-11 01:29:36 +0100 |
| commit | e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1 (patch) | |
| tree | f3f4eb389fa8ee6d533e30a749568c5956c8544c /.zsh.after | |
| parent | b9949cd068f1b27bcd8c9e7518fe7b98e06f7ae2 (diff) | |
| parent | 84aae61d98ea41d45587723c6edffc98cefb40f1 (diff) | |
| download | dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.tar.gz dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.tar.bz2 dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.tar.xz dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.zip | |
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.
...
Diffstat (limited to '.zsh.after')
| -rw-r--r-- | .zsh.after/export.zsh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh index 1c1453d..f2b2d9a 100644 --- a/.zsh.after/export.zsh +++ b/.zsh.after/export.zsh @@ -27,3 +27,17 @@ 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 + +export TMUX_TMPDIR="/run/user/$UID/tmux/" |