From: Ben Beltran <redacted>
Date: Thu, 28 Mar 2013 20:54:19 +0000 (-0600)
Subject: Merge branch 'master' of github.com:benbeltran/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/3f77b12ec88ba42644d7e498434cba8ef9c9fe31?ds=sidebyside;hp=-c

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

3f77b12ec88ba42644d7e498434cba8ef9c9fe31
diff --combined vimrc
index 8b575bc,5ce3d57..b0c9df9
--- a/vimrc
+++ b/vimrc
@@@ -80,6 -80,7 +80,7 @@@ set backspace=indent,eol,star
  
  " load the plugin and indent settings for the detected filetype
  filetype plugin indent on
+ filetype plugin on
  
  " Opens an edit command with the path of the currently edited file filled in
  " Normal mode: <Leader>e
@@@ -160,6 -161,3 +161,6 @@@ set foldlevel=
  
  " powerline stuff
  let g:Powerline_symbols = 'fancy'
 +
 +" node cleaning
 +let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'
diff --combined zshrc
index b649043,a18d284..29ae3ac
--- a/zshrc
+++ b/zshrc
@@@ -17,14 -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_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)
- 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
  
@@@ -55,8 -55,10 +55,11 @@@ 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
  
+ 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.