X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.vimrc;h=47491209880818d71b1e4bd3f0f0c4bf7af4dd6d;hb=313d22890dda2d8affc34e66638f663419c8e238;hp=41371f38668cda90fddac7c54cc0d085d04e44a0;hpb=b9c73567b656eacb7fb101cbebd8c36d3e0ee7f9;p=cmccabe-etc

diff --git a/.vimrc b/.vimrc
index 41371f3..4749120 100644
--- a/.vimrc
+++ b/.vimrc
@@ -68,6 +68,9 @@ 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>
@@ -80,3 +83,9 @@ map \B :ConqueTermVSplit /bin/bash<CR>
 "*************** pre-filled registers ******************
 let @w="Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>"
 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