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

diff --git a/.vimrc b/.vimrc
index b2e722e..bf5bb9c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,11 +1,14 @@
+" Package manager
 execute pathogen#infect()
-syntax enable
-filetype indent plugin on
 
+" 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
@@ -16,27 +19,39 @@ set incsearch
 set noerrorbells
 set novisualbell
 set nobackup
-set nowb
+set nowritebackup
 set noswapfile
-set shiftwidth=2
-set tabstop=2
-set cc=80
+set colorcolumn=80
 set textwidth=79
+set shiftwidth=4
+set tabstop=4
+
+" 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
 
+" GPG options
 let g:GPGPreferArmor=1
 let g:GPGPreferSign=1