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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index c76bfad4d9d1596e27f7ada21e22dbfa063e459d..b818570d458c766901d3af070445a0013701920f 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -24,7 +24,7 @@ export ZSH_THEME="ben-prose"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git brew bundler cap gem osx rails3 rvm)
+plugins=(git brew bundler cap gem osx rails3 rvm dircycle)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -36,6 +36,12 @@ export TERM=screen-256color
 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"
+export VISUAL="vim"
 
 #display fortune when I start
 echo -e "\033[30m"
@@ -47,12 +53,9 @@ alias dwarffortress="/Applications/Dwarf\ Fortress/df"
 alias ls="ls -FG"
 alias rspec="rspec --color"
 
-#Git utility aliases
-alias gpsc="git push origin $GIT_BRANCH"
-alias gplc="git pull origin $GIT_BRANCH"
-
 #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.