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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index 828d9f9ee2afc145355f3e43168512b5013de7d0..29ae3acfd6c3cd5b37fba9e8cda65b59984810e3 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -17,14 +17,14 @@ export ZSH_THEME="ben-prose"
 # DISABLE_LS_COLORS="true"
 
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_LS_COLORS="true"
 
 # Uncomment following line if you want to disable autosetting terminal title.

-# DISABLE_AUTO_TITLE="true"
+DISABLE_AUTO_TITLE="true"

 
 # Uncomment following line if you want disable red dots displayed while waiting for completion
 # DISABLE_COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 
 # Uncomment following line if you want disable red dots displayed while waiting for completion
 # DISABLE_COMPLETION_WAITING_DOTS="true"
 
 # 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 dircycle)
+plugins=(git brew bundler cap gem osx rails3 rvm dircycle command-coloring npm)

 
 source $ZSH/oh-my-zsh.sh
 
 
 source $ZSH/oh-my-zsh.sh
 


@@ -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 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"
 
 #Editor.
 export EDITOR="vim"


@@ -54,6 +55,10 @@ alias rspec="rspec --color"
 
 #Screeninator and RVM scripts
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 
 #Screeninator and RVM scripts
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm

+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+
+bindkey -v
+bindkey '^R' history-incremental-pattern-search-backward

 
 #
 # End of the custom things from my bash profile.
 
 #
 # End of the custom things from my bash profile.


@@ -61,4 +66,4 @@ alias rspec="rspec --color"
 #
 
 # Customize to your needs...
 #
 
 # Customize to your needs...

-export PATH=/Users/benbeltran/.rvm/gems/ruby-1.9.3-p194/bin:/Users/benbeltran/.rvm/gems/ruby-1.9.3-p194@global/bin:/Users/benbeltran/.rvm/rubies/ruby-1.9.3-p194/bin:/Users/benbeltran/.rvm/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin
+export PATH=/usr/local/share/npm/bin:/Users/benbeltran/.rvm/gems/ruby-1.9.3-p194/bin:/Users/benbeltran/.rvm/gems/ruby-1.9.3-p194@global/bin:/Users/benbeltran/.rvm/rubies/ruby-1.9.3-p194/bin:/Users/benbeltran/.rvm/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin