1 files changed, 35 insertions, 24 deletions

diff --git a/vim/.vimrc b/vim/.vimrc
index a8c93c5..97f6ee1 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,51 +1,34 @@
 execute pathogen#infect()
 
+""" DEFAULT VIM SETTINGS
+
 let mapleader=" "
 
 syntax on
 filetype plugin indent on
 
+" Set colorscheme when the terminal has 256 color support
 if &t_Co == 256
         colorscheme Benokai
 endif
 
-" On arch linux install the following:
-" otf-powerline-symbols-git
-" powerline-fonts-git
-let g:airline_powerline_fonts = 1
-if !exists('g:airline_symbols')
-          let g:airline_symbols = {}
-endif
-let g:airline_symbols.space = "\ua0"
-
-set number
+" Some vim settings
+set relativenumber
 set hlsearch
 set list
 set modeline
-set relativenumber
-
 set background=dark
 set foldmethod=indent
 set listchars=trail:·,tab:▸\ ,eol:¬
 set scrolloff=1
 
-autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
-
-function! AppendModeline()
-        let l:modeline = printf(" vim: set ts=%d sw=%d tw=%d %set :",
-                \ &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no')
-        let l:modeline = substitute(&commentstring, "%s", l:modeline, "")
-        call append(line("$"), l:modeline)
-endfunction
-nnoremap <silent> <Leader>ml :call AppendModeline()<CR>
-
+" Switch windows with <C-W>[direction]
 map <C-J> <C-W>j
 map <C-K> <C-W>k
 map <C-H> <C-W>h
 map <C-L> <C-W>l
 
+" Never use the arrow keys
 noremap  <Up> ""
 noremap! <Up> <Esc>
 noremap  <Down> ""
@@ -55,4 +38,32 @@ noremap! <Left> <Esc>
 noremap  <Right> ""
 noremap! <Right> <Esc>
 
+" Append modeline when pressing <leader> ml
+function! AppendModeline()
+        let l:modeline = printf(" vim: set ts=%d sw=%d tw=%d %set :",
+                \ &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no')
+        let l:modeline = substitute(&commentstring, "%s", l:modeline, "")
+        call append(line("$"), l:modeline)
+endfunction
+nnoremap <silent> <Leader>ml :call AppendModeline()<CR>
+
+""" PLUGIN SPECIFIC SETTINGS
+
+" NERDTree:
+" Open NERDTree when no file is specified
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+
+" Airline:
+" On arch linux install the following:
+" otf-powerline-symbols-git
+" powerline-fonts-git
+let g:airline_powerline_fonts = 1
+if !exists('g:airline_symbols')
+        let g:airline_symbols = {}
+endif
+let g:airline_symbols.space = "\ua0"
+set laststatus=2
+
 " vim: set ts=8 sw=8 tw=78 noet :