Long time, no commit, big ol' changes though

bashrc

@@ -12,9 +12,9 @@ export BROWSER=qutebrowser
 
 # Some programs need those changes
 export PATH="/usr/lib/ccache/bin/:$PATH"
-if [ -d $HOME/.gem/ruby/2.4.0/bin ]; then
-    export PATH="$HOME/.gem/ruby/2.4.0/bin/:$PATH"
-fi
+# if [ -d $HOME/.gem/ruby/2.4.0/bin ]; then
+#     export PATH="$HOME/.gem/ruby/2.4.0/bin/:$PATH"
+# fi
 if [ -d /data/data/com.termux/ ]; then
     export PATH="$HOME/.termux/scripts:$HOME/.termux/bin:$PATH"
 fi
@@ -63,15 +63,30 @@ alias mc="machines"
 alias tracefiles="strace -f -t -e trace=file"
 
 # Superseding commands with better ones if they are present
-if which vim &> /dev/null; then
-    alias vi='vim'
-fi
-if which gopass &> /dev/null; then
-    alias pass='gopass'
-fi
-if which wakeonlan &> /dev/null; then
-    alias wol='wakeonlan'
-fi
+function vi() {
+    if which vim &> /dev/null; then
+        alias vi='vim'
+    fi
+    vim "$@"
+}
+function pass() {
+    if which gopass &> /dev/null; then
+        alias pass='gopass'
+    fi
+    gopass "$@"
+}
+function wol() {
+    if which wakeonlan &> /dev/null; then
+        alias wol='wakeonlan'
+    fi
+    wakeonlan "$@"
+}
+function mutt() {
+    if which neomutt &> /dev/null; then
+        alias mutt='neomutt'
+    fi
+    neomutt "$@"
+}
 
 # SHELL CUSTOMIZATION
 
@@ -88,7 +103,8 @@ shopt -s hostcomplete
 
 export HISTSIZE=100000
 export HISTFILESIZE=${HISTSIZE}
-export HISTCONTROL=ignoreboth
+export HISTCONTROL=ignorespace:erasedups
+export HISTTIMEFORMAT="%d/%m/%y %H:%M:%S "
 
 # PROMPT CUSTOMIZATION