.gradle.properties: comment out maxParallelForks=1

[cmccabe-etc] / .vimrc

diff --git a/.vimrc b/.vimrc
index 866efcb..5aa3cfc 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -42,7 +42,7 @@ set visualbell
 "*************** movement stuff ***************
 set splitbelow
 set splitright
-imap <BS> <ESC>
+"imap <BS> <ESC>
 set pastetoggle=<F2>
 
 "*************** gui stuff ***************
@@ -83,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