X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vimrc;h=ce37af6baba252040fbd450d29afca58b8b43217;hb=HEAD;hp=057107bcd3d2c4572866f9fa6a1702c3e51154fc;hpb=cc813ce21a11ac0f8c2e6e4d75fa27509d21f83f;p=cmccabe-etc

diff --git a/.vimrc b/.vimrc
index 057107b..ce37af6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -31,7 +31,10 @@ highlight Constant ctermfg=red
 highlight Search cterm=reverse
 highlight Error ctermfg=white ctermbg=1
 set t_Co=256
+set sw=4
+set ts=4
 set et
+set modelines=0
 
 "*************** bell ***************
 set vb t_vb="."
@@ -40,7 +43,7 @@ set visualbell
 "*************** movement stuff ***************
 set splitbelow
 set splitright
-imap <BS> <ESC>
+"imap <BS> <ESC>
 set pastetoggle=<F2>
 
 "*************** gui stuff ***************
@@ -66,16 +69,24 @@ map ,," :s/^\"//<CR>:nohlsearch<CR>
 " whitespace stripper
 map ,w :s/[\t ][\t ]*$//<CR>
 
+" More ergonomic key binding for omni-complete
+inoremap <C-k><C-k> <C-x><C-o>
+
 "*************** shortcuts **************
 map \b :ConqueTermSplit /bin/bash<CR>
 map \B :ConqueTermVSplit /bin/bash<CR>
 "command Bash execute ":ConqueTerm bash"
 
 "*************** grep plugin ***************
-:let Grep_Default_Filelist = '*.c *.cpp *.cc *.rb *.h *.t *.py *.rst *.go *.java *.S'
+:let Grep_Default_Filelist = '*.c *.cpp *.cc *.hpp *.rb *.h *.t *.py *.rst *.go *.java *.S *.scala'
 :let Grep_Skip_Files = 'core.* *.svn *~ *.swp *.swo *.bak cscope.out cscope.files'
 
 "*************** pre-filled registers ******************
 let @w="Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>"
-let @x="Signed-off-by: Colin Patrick McCabe <cmccabe@acceptas.com>"
-let @s="Signed-off-by: Colin Patrick McCabe <cmccabe@nvidia.com>"
+let @s="Signed-off-by: Colin Patrick McCabe <cmccabe@cloudera.com>"
+
+set t_Co=256
+highlight DiffAdd    ctermfg=NONE ctermbg=grey 
+highlight DiffDelete ctermfg=NONE ctermbg=grey
+highlight DiffChange ctermfg=NONE ctermbg=grey
+highlight DiffText   ctermfg=NONE ctermbg=grey