From b059d5b95323169f9059e8a4d5df9bb3d4478e51 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Fri, 8 Aug 2014 18:09:20 +0200 Subject: zshrc: Move GPG/SSH agent variable setting to .zprofile --- zsh/.zprofile | 3 +++ 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 diff --git a/zsh/.zshrc b/zsh/.zshrc index e4a6859..3752c20 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -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' -- cgit v1.2.3-70-g09d2