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

diff --git a/.vimrc b/.vimrc
index 62e1bac..bf5bb9c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,9 +1,14 @@
+" Package manager
 execute pathogen#infect()
-filetype indent plugin on
-syntax enable
-set background=dark
-colorscheme 256-grayvim
 
+" Automaticly source some files after writing
+autocmd! bufwritepost .vimrc source %
+autocmd! bufwritepost .bashrc !source %
+autocmd! bufwritepost .Xresources !xrdb -merge %
+
+" Some general options
+syntax enable
+filetype indent plugin on
 set encoding=utf-8
 set history=1000
 set number
@@ -14,43 +19,48 @@ set incsearch
 set noerrorbells
 set novisualbell
 set nobackup
-set nowb
+set nowritebackup
 set noswapfile
-set shiftwidth=2
-set tabstop=2
-set foldmethod=indent
-set foldnestmax=2
-set nofoldenable
-set cc=80
+set colorcolumn=80
 set textwidth=79
-set list
-set listchars=tab:\ \ ,eol:¬,trail:_,precedes:<,extends:>
+set shiftwidth=4
+set tabstop=4
 
-" Source the vimrc while editing
-autocmd! bufwritepost .vimrc source %
+" 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
 
-" Tab Mappings
+" 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
 
-" Search results stay in middle of screen
+" Center the search results
 nnoremap n nzzzv
 nnoremap N Nzzzv
 
-" Unmap the arrow keys!!!
+" 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
 
-" 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
+" GPG options
+let g:GPGPreferArmor=1
+let g:GPGPreferSign=1
+
+" Syntastic options
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
 
-let mapleader="'"
-map <leader>n :NERDTreeToggle<CR>
+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