diff --git a/link/nix/zshrc b/link/nix/zshrc index 20baddd..0cdb13a 100644 --- a/link/nix/zshrc +++ b/link/nix/zshrc @@ -5,7 +5,8 @@ export ZSH=~/.oh-my-zsh # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes if [[ `uname` == 'Linux' ]]; then - ZSH_THEME="af-magic" + ZSH_THEME="beanbag" + #ZSH_THEME="af-magic" else ZSH_THEME="beanbag" #ZSH_THEME="pygmalion" @@ -66,12 +67,18 @@ source $ZSH/oh-my-zsh.sh [ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing' -# Add GPG Suite binaries to the path: -export PATH=/usr/local/MacGPG2/bin:$PATH - # Start GPG agent export GPG_TTY=$(tty) -export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh + +if [[ `uname` == 'Linux' ]]; then + export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" +else + # Add GPG Suite binaries to the path: + export PATH=/usr/local/MacGPG2/bin:$PATH + + export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh +fi + gpg-connect-agent updatestartuptty /bye >/dev/null # export MANPATH="/usr/local/man:$MANPATH"