added mailcap, new plugin vim, update xresources and bashrc

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 9debb62..b2e722e 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,7 +1,10 @@
+execute pathogen#infect()
 syntax enable
 filetype indent plugin on
 
 autocmd! bufwritepost .vimrc source %
+autocmd! bufwritepost .bashrc !source %
+autocmd! bufwritepost .Xresources !xrdb -merge %
 
 set encoding=utf-8
 set history=1000
@@ -33,3 +36,16 @@ for prefix in ['i', 'n', 'v']
                exe prefix . "noremap " . key . " <Nop>"
        endfor
 endfor
+
+let g:GPGPreferArmor=1
+let g:GPGPreferSign=1
+
+" Syntastic options
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 0
+let g:syntastic_check_on_wq = 0