highlight Search cterm=reverse
highlight Error ctermfg=white ctermbg=1
set t_Co=256
+set sw=4
+set ts=4
set et
"*************** bell ***************
"*************** movement stuff ***************
set splitbelow
set splitright
-imap <BS> <ESC>
+"imap <BS> <ESC>
set pastetoggle=<F2>
"*************** gui stuff ***************
" 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