1 files changed, 42 insertions, 27 deletions

diff --git a/vim/.vimrc b/vim/.vimrc
index 20d49fb..cde36c1 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,11 +1,11 @@
-execute pathogen#infect()
+silent! execute pathogen#infect()
 
 """ DEFAULT VIM SETTINGS
 
 " Reload vimrc on save
 augroup reload_vimrc " {
-        autocmd!
-        autocmd BufWritePost $MYVIMRC source $MYVIMRC
+    autocmd!
+    autocmd BufWritePost $MYVIMRC source $MYVIMRC
 augroup END " }
 
 let mapleader=" "
@@ -14,9 +14,15 @@ syntax on
 filetype plugin indent on
 
 " Set colorscheme when the terminal has 256 color support
-if &t_Co == 256
-        colorscheme Benokai
-endif
+try
+    if (&t_Co == 256) && match($TERM, "256color") >= 0
+        colorscheme Benokai
+    else
+        throw "nocolor"
+    endif
+catch
+    colorscheme desert
+endtry
 
 " Some vim settings
 set number
@@ -30,7 +36,6 @@ set listchars=trail:·,tab:▸\ ,eol:¬
 set scrolloff=1
 set backspace=indent,eol,start
 set cursorline
-set cursorcolumn
 
 " Disable ex mode
 nnoremap Q <Nop>
@@ -56,30 +61,40 @@ 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)
+    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>
 
+" NeoVIM specifics
+if has('nvim')
+    nmap <BS> <C-W>h
+    tnoremap <Esc> <C-\><C-n>
+endif
+
 """ 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 = {}
+if exists("g:loaded_pathogen")
+
+    " 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
+
 endif
-let g:airline_symbols.space = "\ua0"
-set laststatus=2
 
-" vim: set ts=8 sw=8 tw=78 noet :
+" vim: set ts=4 sw=4 tw=4 et :