Updated

2 files changed, 101 insertions, 84 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index 48c3ee6..4be0f7f 100755
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,13 +1,8 @@
-#
-# ~/.bashrc
-#
-
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
 [ -f "/etc/bashrc" ] && source "/etc/bashrc"
 
-
 # Default PS1
 export PS1='[\d][\t]\u on \h\n\w $ '
 
@@ -28,7 +23,6 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/usr/lib"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/usr/local/lib"
 
-
 export ANDROID_HOME="$HOME/Android/Sdk"
 
 # Quit the shell like in vim
@@ -36,157 +30,180 @@ alias :q="exit"
 
 # Keep OS compatibility
 case "$(uname)" in
-        Linux)
-                alias ls="ls --color=auto"
-                usr="/usr"
-                ;;
-        FreeBSD|Darwin)
-                alias ls="ls -G"
-                usr="/usr/local"
-                ;;
+    Linux)
+        alias ls="ls --color=auto"
+        usr="/usr"
+        ;;
+    FreeBSD|Darwin)
+        alias ls="ls -G"
+        usr="/usr/local"
+        ;;
 esac
 
 # Colorfull manpages
 man() {
-        env LESS_TERMCAP_mb=$'\E[01;31m' \
-        LESS_TERMCAP_md=$'\E[01;38;5;74m' \
-        LESS_TERMCAP_me=$'\E[0m' \
-        LESS_TERMCAP_se=$'\E[0m' \
-        LESS_TERMCAP_so=$'\E[38;5;246m' \
-        LESS_TERMCAP_ue=$'\E[0m' \
-        LESS_TERMCAP_us=$'\E[04;38;5;146m' \
-        man "$@"
+    env LESS_TERMCAP_mb=$'\E[01;31m' \
+    LESS_TERMCAP_md=$'\E[01;38;5;74m' \
+    LESS_TERMCAP_me=$'\E[0m' \
+    LESS_TERMCAP_se=$'\E[0m' \
+    LESS_TERMCAP_so=$'\E[38;5;246m' \
+    LESS_TERMCAP_ue=$'\E[0m' \
+    LESS_TERMCAP_us=$'\E[04;38;5;146m' \
+    man "$@"
 }
 
 # Helpfull functions
 exists() {
-        type $@ &> /dev/null
+    type $@ &> /dev/null
 }
 
 is_function() {
-        function=$(type $@ 2> /dev/null | awk '/is a function/ { print "1" }')
-        if [ -n "$function" ]; then
-                return 0
-        else
-                return 1
-        fi
+    function=$(type $@ 2> /dev/null | awk '/is a function/ { print "1" }')
+    if [ -n "$function" ]; then
+        return 0
+    else
+        return 1
+    fi
 }
 
 is_alias() {
-        alias=$(type $1 2> /dev/null | awk '/is aliased to/ { print "1" }')
-        if [ -n "$alias" ]; then
-                return 0
-        else
-                return 1
-        fi
+    alias=$(type $1 2> /dev/null | awk '/is aliased to/ { print "1" }')
+    if [ -n "$alias" ]; then
+        return 0
+    else
+        return 1
+    fi
 }
 
 # Set autocomplete for sudo
 if exists complete && exists sudo; then
-        complete -cf sudo
+    complete -cf sudo
 fi
 
 # Jupiterbroadcasting live stream
 if exists mpv; then
-        alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream'
+    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'
+    alias jblive='vlc rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream'
 fi
 
 # Set the default editor
 if exists nvim; then
-        export EDITOR="nvim"
+    export EDITOR="nvim"
 elif exists vim; then
-        export EDITOR="vim"
+    export EDITOR="vim"
 elif exists vi; then
-        export EDITOR="vi"
+    export EDITOR="vi"
 fi
 
 vim() {
-        vim_bin=$(which $EDITOR)
-        if [[ -z "$@" ]]; then
-                $vim_bin
-        elif [[ -d "$@" ]]; then
-                dir=$(pwd)
-                cd $@ && $vim_bin && cd $dir
-        else
-                $vim_bin $@
-        fi
+    vim_bin=$(which $EDITOR)
+    if [[ -z "$@" ]]; then
+        $vim_bin
+    elif [[ -d "$@" ]]; then
+        dir=$(pwd)
+        cd $@ && $vim_bin && cd $dir
+    else
+        $vim_bin $@
+    fi
 }
 
 # Programming language specifics
 if exists go; then
-        export GOPATH="$HOME/programming/go"
-        export PATH="$PATH:$GOPATH/bin"
+    export GOPATH="$HOME/programming/go"
+    export PATH="$PATH:$GOPATH/bin"
 fi
 
 if exists gem; then
-        export GEM_HOME="$(ruby -e 'print Gem.user_dir')"
-        export PATH="$PATH:$GEM_HOME/bin"
+    export GEM_HOME="$(ruby -e 'print Gem.user_dir')"
+    export PATH="$GEM_HOME/bin:$PATH"
 fi
 
 # Ezjail shortcuts
 if exists ezjail-admin && exists sudo; then
-        jl() {
-                sudo ezjail-admin $1 $2\.tomvanderlee.com
-        }
+    jl() {
+        sudo ezjail-admin $1 $2\.tomvanderlee.com
+    }
 fi
 
 # Showbanned ipadresses
 if exists pfctl && exists sudo; then
-        showbanned () {
-                for table in "fail2ban" "permaban"; do
-                        banned=$(sudo pfctl -t $table -T show 2> /dev/null)
-
-                        if [ -z "$banned" ]; then
-                                nrBanned="0"
-                        else
-                                nrBanned=$(echo "$banned" | wc -l | awk '{ print $1 }')
-                        fi
-
-                        echo -e "$table ($nrBanned)\n$banned"
-                done
-        }
+    showbanned () {
+        for table in "fail2ban" "permaban"; do
+            banned=$(sudo pfctl -t $table -T show 2> /dev/null)
+
+            if [ -z "$banned" ]; then
+                nrBanned="0"
+            else
+                nrBanned=$(echo "$banned" | wc -l | awk '{ print $1 }')
+            fi
+
+            echo -e "$table ($nrBanned)\n$banned"
+        done
+    }
 fi
 
 # Always use pacaur even if it is not installed
 if (exists pacman && ! exists pacaur) && exists sudo; then
-        alias pacaur="sudo pacman"
+    alias pacaur="sudo pacman"
 fi
 
 # Set the default pager
 if exists less; then
-        export PAGER="less"
+    export PAGER="less"
 fi
 
 # Set the virtualenv parameters
 if exists virtualenvwrapper.sh; then
-        export WORKON_HOME=$HOME/.virtualenvs
-        source $(which virtualenvwrapper.sh) 2> /dev/null
+    export WORKON_HOME=$HOME/.virtualenvs
+    source $(which virtualenvwrapper.sh) 2> /dev/null
 fi
 
 # Start gnome-keyring-daemon
 if exists gnome-keyring-daemon; then
-        if [ -n "$DESKTOP_SESSION" ];then
-                eval $(gnome-keyring-daemon --start 2> /dev/null)
-                export SSH_AUTH_SOCK
-        fi
+    if [ -n "$DESKTOP_SESSION" ];then
+        eval $(gnome-keyring-daemon --start 2> /dev/null)
+        export SSH_AUTH_SOCK
+    fi
 fi
 
 if exists sensible.bash; then
-        source sensible.bash
+    source sensible.bash
 fi
 
 # Fancy bash prompt
 if exists liquidprompt; then
-        source $(which liquidprompt) 2> /dev/null
+    source $(which liquidprompt) 2> /dev/null
 fi
 
 # Fancy system info