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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index b818570d458c766901d3af070445a0013701920f..59f79a1fed1f31ea1c82429100ff1f3ffcdce893 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
 


@@ -57,10 +57,12 @@ alias rspec="rspec --color"
 [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
 
 [[ -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.
 # There's probably a more "zsh-ish" way of doing these, but I have no time.
 #
 
 # Customize to your needs...
 #
 # End of the custom things from my bash profile.
 # There's probably a more "zsh-ish" way of doing these, but I have no time.
 #
 
 # 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