mirror of
https://github.com/balkian/dotfiles.git
synced 2024-11-23 04:32:29 +00:00
Should fix ssh-agent in tmux+ssh
This commit is contained in:
parent
f1add8adda
commit
95427a4a87
13
zshrc
13
zshrc
@ -37,9 +37,7 @@ export UPDATE_ZSH_DAYS=13
|
|||||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||||
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
plugins=(git colored-man virtualenvwrapper cp python wd systemadmin pass ssh-agent)
|
plugins=(git colored-man virtualenvwrapper cp python wd systemadmin pass)
|
||||||
|
|
||||||
zstyle :omz:plugins:ssh-agent agent-forwarding on
|
|
||||||
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
@ -72,7 +70,7 @@ function newdev () {
|
|||||||
|
|
||||||
PYTHONSTARTUP=~/.pythonrc.py
|
PYTHONSTARTUP=~/.pythonrc.py
|
||||||
export PYTHONSTARTUP
|
export PYTHONSTARTUP
|
||||||
ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'; alias mosh='ssh-add -l >/dev/null || ssh-add && unalias mosh; mosh'
|
ssh-add -l 2>&1 > /dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'; alias mosh='ssh-add -l >/dev/null || ssh-add && unalias mosh; mosh'
|
||||||
|
|
||||||
### Added by the Heroku Toolbelt
|
### Added by the Heroku Toolbelt
|
||||||
export PATH="$PATH:/usr/local/heroku/bin:$HOME/.cabal/bin"
|
export PATH="$PATH:/usr/local/heroku/bin:$HOME/.cabal/bin"
|
||||||
@ -84,3 +82,10 @@ setopt extended_glob
|
|||||||
|
|
||||||
### Get RVM to work with zsh
|
### Get RVM to work with zsh
|
||||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
|
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
|
||||||
|
|
||||||
|
### Agent forwarding in tmux too
|
||||||
|
if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh/ssh_auth_sock" ] ; then
|
||||||
|
unlink "$HOME/.ssh/ssh_auth_sock" 2>/dev/null
|
||||||
|
ln -s "$SSH_AUTH_SOCK" "$HOME/.ssh/ssh_auth_sock"
|
||||||
|
export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock"
|
||||||
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user