pew
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forgot to symlink to modified zshrc

master
Paul Walko 2019-12-05 12:18:35 -05:00
parent 61c27e32ce
commit ee1e80fc3b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zshrc
View File

@ -37,14 +37,12 @@ fi
## Yubico openpgp: https://support.yubico.com/support/solutions/articles/15000006420-using-your-yubikey-with-openpgp ## Yubico openpgp: https://support.yubico.com/support/solutions/articles/15000006420-using-your-yubikey-with-openpgp
# Run if NOT ssh session # Run if NOT ssh session
if [ -z "$SSH_CLIENT" ] || [ -z "$SSH_TTY" ]; then if [ -z "$SSH_CLIENT" ] || [ -z "$SSH_TTY" ]; then
CONTINUE=true
if [[ "$OSTYPE" == 'darwin'* ]]; then if [[ "$OSTYPE" == 'darwin'* ]]; then
eval `ssh-agent` eval `ssh-agent`
ssh-add -t 48h -s $OPENSC_LIBS/opensc-pkcs11.so ssh-add -t 48h -s $OPENSC_LIBS/opensc-pkcs11.so
CONTINUE=false
fi fi
if [[ "$CONTINUE" == true ]]; then if [[ "$OSTYPE" != 'darwin'* || ("$?" != '0' && "$OSTYPE" == 'darwin'*) ]]; then
unset SSH_AGENT_PID unset SSH_AGENT_PID
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
@ -61,11 +59,6 @@ if [[ "$OSTYPE" == 'darwin'* ]]; then
export PATH=$PATH:$HOME/.linkerd2/bin export PATH=$PATH:$HOME/.linkerd2/bin
export OPENSC_LIBS=/usr/local/lib export OPENSC_LIBS=/usr/local/lib
source $HOME/.cargo/env source $HOME/.cargo/env
# ssh-agent config
eval `ssh-agent`
ssh-add -t 48h -s $OPENSC_LIBS/opensc-pkcs11.so
if [ "$?" -ne 0 ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
elif [[ "$OSTYPE" == 'linux-gnu' ]]; then elif [[ "$OSTYPE" == 'linux-gnu' ]]; then
eval `dircolors ~/.config/dircolors-solarized/dircolors.256dark` eval `dircolors ~/.config/dircolors-solarized/dircolors.256dark`
fi fi