Merge branch 'master' of github.com:benbeltran/dotfiles

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index 828d9f9ee2afc145355f3e43168512b5013de7d0..b818570d458c766901d3af070445a0013701920f 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -37,6 +37,7 @@ export JAVA_HOME=$(/usr/libexec/java_home)
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
 export PYTONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
+export PS1="$PS1"'$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I_#P") "$PWD")'
 
 #Editor.
 export EDITOR="vim"
@@ -54,6 +55,7 @@ alias rspec="rspec --color"
 
 #Screeninator and RVM scripts
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
 
 #
 # End of the custom things from my bash profile.