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

[rbdr/dotfiles] / zshrc

diff --git a/zshrc b/zshrc
index 696cce6d007203dab99433479e90183cbbe16ef6..59f79a1fed1f31ea1c82429100ff1f3ffcdce893 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -24,7 +24,7 @@ DISABLE_AUTO_TITLE="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)
 
 # 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
 


@@ -55,8 +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 -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.


@@ -64,4 +66,3 @@ bindkey -v
 #
 
 # Customize to your needs...
 #
 
 # Customize to your needs...

-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