2 files changed, 75 insertions, 65 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index e8a61fc..247955a 100755
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -5,14 +5,18 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+# Default PS1
 export PS1='[\d][\t]\u on \h\n\w $ '
 
+# Additional local paths
 export PATH="$PATH:$HOME/.local/bin"
 export PATH="$PATH:$HOME/.local/usr/bin"
 export PATH="$PATH:$HOME/.local/usr/local/bin"
 
+# Quit the shell like in vim
 alias :q="exit"
 
+# Keep OS compatibility
 case "$(uname)" in
         Linux)
                 alias ls="ls --color=auto"
@@ -28,6 +32,7 @@ case "$(uname)" in
                 ;;
 esac
 
+# Colorfull manpages
 man() {
         env LESS_TERMCAP_mb=$'\E[01;31m' \
         LESS_TERMCAP_md=$'\E[01;38;5;74m' \
@@ -39,6 +44,7 @@ man() {
         man "$@"
 }
 
+# Helpfull functions
 exists() {
         hash $@ 2> /dev/null
 }
@@ -61,57 +67,39 @@ is_alias() {
         fi
 }
 
-if exists sudo; then
-        sudo() {
-                # Allow functions and aliasses to be executed with sudo
-                if is_function $1 2> /dev/null; then
-                        tmpfile="/tmp/$(date +%s).sh"
-
-                        echo "#!$usr/bin/bash" > "$tmpfile"
-                        echo "usr=$usr" >> "$tmpfile"
-                        type $1 | grep -v "is a function" >> "$tmpfile"
-                        echo "$@" >> "$tmpfile"
-
-                        chmod +x "$tmpfile"
-
-                        $usr/bin/sudo "$tmpfile"
-
-                        rm "$tmpfile"
-                elif is_alias $1 2> /dev/null; then
-                        alias=$(type $1 2> /dev/null |
-                                sed -n "s/^$1\ is\ aliased\ to\ \`\(.*\)'$/\1/p")
-
-                        $usr/bin/sudo "$alias"
-                else
-                        $usr/bin/sudo "$@"
-                fi
-        }
-fi
-
+# Set autocomplete for sudo
 if exists complete && exists sudo; then
         complete -cf sudo
 fi
 
+# Jupiterbroadcasting live stream
 if exists mpv; then
         alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream'
 elif exists vlc; then
         alias jblive='vlc rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream'
 fi
 
-if exists vim; then
+# Set the default editor
+if exists nvim; then
+        export EDITOR="nvim"
+elif exists vim; then
         export EDITOR="vim"
-        vim() {
-                if [[ -z $@ ]]; then
-                        $usr/bin/vim
-                elif [[ -d $@ ]]; then
-                        dir=$(pwd)
-                        cd $@ && $usr/bin/vim && cd $dir
-                else
-                        $usr/bin/vim $@
-                fi
-        }
+elif exists vi; then
+        export EDITOR="vi"
 fi
 
+vim() {
+        if [[ -z $@ ]]; then
+                $EDITOR
+        elif [[ -d $@ ]]; then
+                dir=$(pwd)
+                cd $@ && $EDITOR && cd $dir
+        else
+                $EDITOR $@
+        fi
+}
+
+# Programming language specifics
 if exists go; then
         export GOPATH="$HOME/programming/go"
         export PATH="$PATH:$GOPATH/bin"
@@ -122,12 +110,14 @@ if exists gem; then
         export PATH="$PATH:$GEM_HOME"
 fi
 
+# Ezjail shortcuts
 if exists ezjail-admin && exists sudo; then
         jl() {
                 sudo ezjail-admin $1 $2\.tomvanderlee.com
         }
 fi
 
+# Showbanned ipadresses
 if exists pfctl && exists sudo; then
         showbanned ()
         {
@@ -145,14 +135,17 @@ if exists pfctl && exists sudo; then
         }
 fi
 
+# Always use pacaur even if it is not installed
 if (exists pacman && ! exists pacaur) && exists sudo; then
         alias pacaur="sudo pacman"
 fi
 
+# Set the default pager
 if exists less; then
         export PAGER="less"
 fi
 
+# Pip upgrade script
 if exists pip; then
         pip() {
                 if [[ "$1" == "upgrade" ]] || [[ "$1" == "update" ]]; then
@@ -170,10 +163,12 @@ if exists pip; then
         }
 fi
 
+# Fancy bash prompt
 if exists liquidprompt; then
         source liquidprompt
 fi
 
+# Fancy system info
 if exists archey3; then
         archey3
 elif exists screenfetch; then
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
+if exists("g:loaded_pathogen")
+
+    " NERDTree: