1 files changed, 6 insertions, 7 deletions
diff --git a/zshrc b/zshrc
index 5d7dfde..6b9249c 100644..100755
--- a/zshrc
+++ b/zshrc
@@ -78,21 +78,20 @@ export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects
 alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
 alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
-alias bib='source ~/.virtualenvs/bib/bin/activate'
 alias ducks='du -cks * |sort -rn |head -11'
-source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
+source /usr/local/bin/virtualenvwrapper.sh
 # emacsclient is a script located in ~/bin
 alias emacs='emacsclient -nw'
 alias dc='docker-compose'
 #. ~/.cargo/env
 eval "$(direnv hook zsh)"
-if [ -f "${HOME}/.gpg-agent-info" ]; then
+export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-  . "${HOME}/.gpg-agent-info"
-  export GPG_AGENT_INFO
-  export SSH_AUTH_SOCK
-fi
 export GPG_TTY=$(tty)
 export COMPOSE_HTTP_TIMEOUT=600
 export DOCKER_CLIENT_TIMEOUT=120

diff --git a/zshrc b/zshrc index 5d7dfde..6b9249c 100644..100755 --- a/zshrc +++ b/zshrc
@@ -78,21 +78,20 @@ export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects
78		78
79	alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'	79	alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
80	alias cleanbranches='git branch --merged \| grep -v "\*" \| xargs -n 1 git branch -d; git branch -r --merged master \| grep -iv "master" \| sed "s/origin\///" \| xargs -n 1 git push --delete origin'	80	alias cleanbranches='git branch --merged \| grep -v "\*" \| xargs -n 1 git branch -d; git branch -r --merged master \| grep -iv "master" \| sed "s/origin\///" \| xargs -n 1 git push --delete origin'
81	alias bib='source ~/.virtualenvs/bib/bin/activate'	81
82	alias ducks='du -cks * \|sort -rn \|head -11'	82	alias ducks='du -cks * \|sort -rn \|head -11'
83	source /usr/share/virtualenvwrapper/virtualenvwrapper.sh	83	source /usr/local/bin/virtualenvwrapper.sh
84		84
85	# emacsclient is a script located in ~/bin	85	# emacsclient is a script located in ~/bin
86	alias emacs='emacsclient -nw'	86	alias emacs='emacsclient -nw'
		87
87	alias dc='docker-compose'	88	alias dc='docker-compose'
		89
88	#. ~/.cargo/env	90	#. ~/.cargo/env
89	eval "$(direnv hook zsh)"	91	eval "$(direnv hook zsh)"
90		92
91	if [ -f "${HOME}/.gpg-agent-info" ]; then	93	export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
92	. "${HOME}/.gpg-agent-info"	94
93	export GPG_AGENT_INFO
94	export SSH_AUTH_SOCK
95	fi
96	export GPG_TTY=$(tty)	95	export GPG_TTY=$(tty)
97	export COMPOSE_HTTP_TIMEOUT=600	96	export COMPOSE_HTTP_TIMEOUT=600
98	export DOCKER_CLIENT_TIMEOUT=120	97	export DOCKER_CLIENT_TIMEOUT=120