From 4fa1a0959e1a98b008bc1ed7249b5e633dd0dabd Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Thu, 15 Nov 2012 13:05:57 -0500
Subject: [PATCH] bunch of random updates/improvements

- filter out log/tmp directories from grep searches
- add ruby doc searching
---
 .gitmodules             |  3 +++
 .vim/bundle/vim-monokai |  1 +
 .vimrc                  | 21 +++++++++++++++++----
 .zshrc                  |  3 ++-
 setup_notes.txt         | 10 ++++++++++
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 160000 .vim/bundle/vim-monokai
 create mode 100644 setup_notes.txt

diff --git a/.gitmodules b/.gitmodules
index 5cd9997..d401dc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule ".vim/bundle/cctrlp.vim"]
 	path = .vim/bundle/cctrlp.vim
 	url = https://github.com/kien/ctrlp.vim.git
+[submodule ".vim/bundle/vim-monokai"]
+	path = .vim/bundle/vim-monokai
+	url = git://github.com/sickill/vim-monokai.git
diff --git a/.vim/bundle/vim-monokai b/.vim/bundle/vim-monokai
new file mode 160000
index 0000000..496ac90
--- /dev/null
+++ b/.vim/bundle/vim-monokai
@@ -0,0 +1 @@
+Subproject commit 496ac9039f016fda75d7787a28abfba5481f7347
diff --git a/.vimrc b/.vimrc
index 08f36e4..d6bc739 100644
--- a/.vimrc
+++ b/.vimrc
@@ -8,9 +8,6 @@ call pathogen#helptags()
 set runtimepath^=~/.vim/bundle/ctrlp.vim
 map <leader>gR :call ShowRoutes()<cr>
 map <leader>gv :CtrlP app/views<cr>
-
-" Command-T Config
-map <leader>gv :CtrlP app/views<cr>
 map <leader>gc :CtrlP app/controllers<cr>
 map <leader>gm :CtrlP app/models<cr>
 map <leader>gh :CtrlP app/helpers<cr>
@@ -73,6 +70,7 @@ filetype plugin indent on
 set wildmode=longest,list
 " make tab completion for files/buffers act like bash
 set wildmenu
+colorscheme Monokai
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " CUSTOM AUTOCMDS
@@ -150,14 +148,29 @@ function! RenameFile()
 endfunction
 map <leader>n :call RenameFile()<cr>
 
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" GREP SEARCH 
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 function! Search()
   let term = input('Grep search term: ')
   if term != ''
-    exec '!grep ' . term . ' .'
+    exec '!grep "' . term . '" .'
   endif
 endfunction
 map <leader>s :call Search()<cr>
 
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" RUBY DOC SEARCH 
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+function! RubyDocSearch()
+  let term = input('Ruby Doc search term: ')
+  if term != ''
+    exec '!ri ' . term 
+  endif
+endfunction
+map <leader>d :call RubyDocSearch()<cr>
+
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " PROMOTE VARIABLE TO RSPEC LET
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/.zshrc b/.zshrc
index 281dc93..101c2f4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -31,7 +31,7 @@ alias ls='ls -G'
 alias ll='ls -lG'
 alias l='ls -laG'
 alias duh='du -csh'
-export GREP_OPTIONS="-nr --color"
+export GREP_OPTIONS="-nRi --color --exclude-dir=tmp --exclude-dir=log"
 
 # Unbreak history
 export HISTSIZE=10000
@@ -44,6 +44,7 @@ alias g=git
 alias gco='git co'
 alias gst='git st'
 alias gci='git ci'
+alias gpff='git pullff'
 alias gp='git push'
 alias gpom='git push origin master'
 alias gf='git fetch'
diff --git a/setup_notes.txt b/setup_notes.txt
new file mode 100644
index 0000000..2788942
--- /dev/null
+++ b/setup_notes.txt
@@ -0,0 +1,10 @@
+Setting up Ruby
+---------------
+
+* Install rvm
+* Install bundler
+* Install Ruby Docs
+  gem install rdoc-data
+  rdoc-data --install
+  # to regenerate all gem docs
+  gem rdoc --all --overwrite