From 4c6f0ee52fb2376b4dbd438d8cb8573f8e8b3604 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Mon, 7 Nov 2011 13:31:51 -0500
Subject: [PATCH] Oops, last commit didn't include the changes to .vimrc

---
 vimrc | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/vimrc b/vimrc
index 0407d21..f55322b 100644
--- a/vimrc
+++ b/vimrc
@@ -70,8 +70,12 @@ let g:solarized_contrast="high"
 let g:solarized_visibility="high"
 colorscheme solarized
 
-" some maps
+" NERDTree
 nnoremap <silent> <leader>n :NERDTreeToggle <CR>
+let NERDTreeMinimalUI=1
+let NERDTreeDirArrows=1
+
+" Tagbar
 nnoremap <silent> <leader>t :TagbarToggle <CR>
 let g:EasyMotion_leader_key = '<Leader>e'
 
@@ -80,14 +84,30 @@ if has("gui_running")
     set go=-t
 endif
 
-" Syntastic
+" status line. stolen from here:
+" https://github.com/lukaszkorecki/DotFiles/blob/master/vimrc
+set statusline=
+set statusline+=%f\ %2*%m\ %1*%h
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%{fugitive#statusline()}
 set statusline+=%*
+set statusline+=%r%=[%{&encoding}\ %{&fileformat}\ %{strlen(&ft)?&ft:'none'}]\ %12.(%c:%l/%L%)
+set laststatus=2
 
+" Syntastic
 let g:syntastic_enable_signs=1
 let g:syntastic_auto_loc_list=1
 
+" Highlight current line
+set cursorline
+
+" Highlight column 80
+if version > 702
+    set colorcolumn=80
+endif
+
+
 " quickly move between splits
 nmap <silent> <c-h> <c-w>h
 nmap <silent> <c-l> <c-w>l
@@ -95,4 +115,5 @@ nmap <silent> <c-j> <c-w>j
 nmap <silent> <c-k> <c-w>k
 
 " pretty line endings and trailing spaces
-set list listchars=tab:»·,trail:·,eol:·
+set list listchars=tab:»·,trail:·,eol:↪
+" set list listchars=tab:»·,trail:·,eol:·