X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=.vimrc;h=bf5bb9c801b6d91ed5d16d0494140d422c8afb27;hb=59341d0430a1e1b51be924d969628bee99e7fe36;hp=7aab32866c0ef6554399e96cc10f0768421caf0a;hpb=bd14b9393ad27ac16aaa010a6561a5894a1fcfbd;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 7aab328..bf5bb9c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,7 +1,15 @@
-filetype indent plugin on
+" Package manager
+execute pathogen#infect()
+
+" Automaticly source some files after writing
+autocmd! bufwritepost .vimrc source %
+autocmd! bufwritepost .bashrc !source %
+autocmd! bufwritepost .Xresources !xrdb -merge %
+
+" Some general options
 syntax enable
-color torte
-hi Normal ctermbg=NONE
+filetype indent plugin on
+set encoding=utf-8
 set history=1000
 set number
 set ruler
@@ -11,26 +19,48 @@ set incsearch
 set noerrorbells
 set novisualbell
 set nobackup
-set nowb
+set nowritebackup
 set noswapfile
+set colorcolumn=80
+set textwidth=79
 set shiftwidth=4
 set tabstop=4
-set foldmethod=indent
-set foldnestmax=2
-set nofoldenable
 
-" Unmap the arrow keys!!!
+" List characters to mark trailing whitespace etc
+set listchars=nbsp:¬,tab:▸\ ,eol:↩,extends:»,precedes:«,trail:•
+set nolist
+
+" Move through long lines as they were short multiple lines
+map j gj
+map k gk
+
+" Custom split switching using tab
+map <TAB>l <C-W>l
+map <TAB>h <C-W>h
+map <TAB>j <C-W>j
+map <TAB>k <C-W>k
+
+" Center the search results
+nnoremap n nzzzv
+nnoremap N Nzzzv
+
+" Unbind arrow keys, who has them anyways on the keyboard...
 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
 
-" Macro for compiling and running a tex file
-au BufNewFile,BufRead *.tex let @a = ':w
:!latex % && latex % && if [ -f %:r.bib ]; then bibtex %:r; fi; latex % && pdflatex %
'
+" GPG options
+let g:GPGPreferArmor=1
+let g:GPGPreferSign=1
 
-" 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
+" 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