X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/e5d7e78f09fdaad72aea931b18487328d4509297..0716bcc1f67f9f8caebc6788454cd4171a08414b:/aliases

diff --git a/aliases b/aliases
index 92baf77..6fb1ae1 100644
--- a/aliases
+++ b/aliases
@@ -13,19 +13,41 @@ alias df='df -h'                 # human-readable sizes
 du() { /usr/bin/du -h ${@} | sort -h }
 alias free='free -m'             # show sizes in MB
 
+# run vim or drop file in parent vim instance if inside vim terminal
+function vim {
+    if [[ -z "${VIM_TERMINAL}" ]]; then
+        # Not in VIM_TERMINAL, simply run vim with all arguments
+        command vim "$@"
+        return
+    fi
+
+    for f in "$@"; do
+        if [[ "${f:0:1}" == "-" ]]; then
+            echo "Running in Vim's terminal, not accepting options!" >&2
+            return 1
+        fi
+    done
+    for f in "$@"; do
+        # drop the file onto the running vim instance
+        # see :h terminal-communication
+        echo -e "]51;[\"drop\", \"$f\"]"
+    done
+}
 alias vi='vim'
 alias svi='sudo -e'
 #alias vp='vim PKGBUILD' # I have a script for that in ~/bin
 alias vs='vim SPLITBUILD'
 
+alias mutt='neomutt'
+
 # colours, I want more colours
-alias diff='colordiff'
+[[ -x /usr/bin/colordiff ]] && alias diff='colordiff'
 
 # colours and case insensitive search
 export LESS='-RSi'
 
 # yes I'm that lazy
-alias o='mimeo'
+alias o='rifle'
 
 # suspend screensaver when vlc is running
 alias vlc-suspend='xdg-screensaver suspend $(xprop -name vlc | grep "WM_CLIENT_LEADER(WINDOW)" | sed "s/.*\(0x\d*\)/\1/")'