diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2014-08-08 18:09:20 +0200 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2014-08-08 18:09:20 +0200 |
| commit | b059d5b95323169f9059e8a4d5df9bb3d4478e51 (patch) | |
| tree | 8fe018abafa544b50bb83e2a75544db2bf04a0eb | |
| parent | c74cbd44b1129b912aff098b3ad81547421ff81a (diff) | |
| download | dotfiles-b059d5b95323169f9059e8a4d5df9bb3d4478e51.tar.xz | |
zshrc: Move GPG/SSH agent variable setting to .zprofile
| -rw-r--r-- | zsh/.zprofile | 3 | ||||
| -rw-r--r-- | zsh/.zshrc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/zsh/.zprofile b/zsh/.zprofile index d9242ae..8388786 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -41,6 +41,9 @@ export FQDN=$(hostname -f) # LS_COLORS is now required for `ls` to use colour source <(dircolors -b "$XDG_CONFIG_HOME"/dircolors) +[[ -S '/run/user/1000/keyring/gpg' ]] && export GPG_AGENT_INFO='/run/user/1000/keyring/gpg:0:1' +[[ -S '/run/user/1000/keyring/ssh' ]] && export SSH_AUTH_SOCK='/run/user/1000/keyring/ssh' + if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then exec startx "$XDG_CONFIG_HOME"/X11/xinitrc fi @@ -100,6 +100,3 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then zle -N zle-line-init zle -N zle-line-finish fi - -[[ -S '/run/user/1000/keyring/gpg' ]] && export GPG_AGENT_INFO='/run/user/1000/keyring/gpg:0:1' -[[ -S '/run/user/1000/keyring/ssh' ]] && export SSH_AUTH_SOCK='/run/user/1000/keyring/ssh' |