X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=.vimrc;h=44c3fb1bb8757ad72a80ffe5dcedc357de30093f;hb=159915cd7d8d22af8f27c7bc735079c4347877b2;hp=303fbff640528b63a0fc08a5e11d5d14b047f727;hpb=46ceb3f058de4733444f96ea1803504e65a7f460;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 303fbff..44c3fb1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,7 +1,10 @@
-filetype indent plugin on
+execute pathogen#infect()
 syntax enable
-color torte
-hi Normal ctermbg=NONE
+filetype indent plugin on
+
+autocmd! bufwritepost .vimrc source %
+autocmd! bufwritepost .bashrc !source %
+autocmd! bufwritepost .Xresources !xrdb -merge %
 
 set encoding=utf-8
 set history=1000
@@ -15,38 +18,24 @@ set novisualbell
 set nobackup
 set nowb
 set noswapfile
-set shiftwidth=4
-set tabstop=4
-set foldmethod=indent
-set foldnestmax=2
-set nofoldenable
+set shiftwidth=2
+set tabstop=2
 set cc=80
 set textwidth=79
-set list
-set listchars=tab:►\ ,eol:¬,trail:˽,precedes:˻,extends:˼
 
-" Source the vimrc while editing
-autocmd! bufwritepost .vimrc source %
-
-" Tab Mappings
 map <TAB>l <C-W>l
 map <TAB>h <C-W>h
 map <TAB>j <C-W>j
 map <TAB>k <C-W>k
 
-" Search results stay in middle of screen
 nnoremap n nzzzv
 nnoremap N Nzzzv
 
-" Unmap the arrow keys!!!
 for prefix in ['i', 'n', 'v']
-	for key in ['<Up>', '<Down>', '<Left>', '<Right>']
+	for key in ['<UP', '<DOWN>', '<LEFT>', '<RIGHT>']
 		exe prefix . "noremap " . key . " <Nop>"
 	endfor
 endfor
 
-" Load all the skeletons for newfiles
-for i in split(globpath('~/.vim/skel/', './*'), '\n')
-	let extension = split(i, "/")[-1]
-	exe "au BufNewFile *." . extension . " 0r ~/.vim/skel/" . extension
-endfor
+let g:GPGPreferArmor=1
+let g:GPGPreferSign=1