X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/eabc80c4d9e790bfee4304a642430523f2965eb6..a59aa3f7d15dae57e2d066e47af3556c46d9dac4:/aliases

diff --git a/aliases b/aliases
index 6549e37..e7b0a12 100644
--- a/aliases
+++ b/aliases
@@ -2,38 +2,51 @@
 # this will allow aliasing any command after sudo
 alias sudo='sudo '
 
-alias l='ls --color=auto -F'
 alias ls='ls --color=auto -F'
+alias l='ls'
 alias ll='ls -lh --color=auto -F'
 alias la='ls -lha --color=auto -F'
 
-#alias grep='grep --color=tty -d skip'
-
 alias cp='cp -i --reflink=auto'  # interactive + auto CoW
 alias df='df -h'                 # human-readable sizes
 du() { /usr/bin/du -h ${@} | sort -h }
 alias free='free -m'             # show sizes in MB
 
-alias vi='vim'
+if [[ -n "${VIM_TERMINAL}" ]]; then
+    function vim() {
+        if (( ${#@} == 0 )); then
+            echo "Running in Vim's terminal, at least one file must be given!" >&2
+            return 22
+        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
+            local abspath=$(realpath $f)
+            echo -e "]51;[\"drop\", \"$abspath\"]"
+        done
+    }
+fi
+alias vi=nvim
 alias svi='sudo -e'
 #alias vp='vim PKGBUILD' # I have a script for that in ~/bin
 alias vs='vim SPLITBUILD'
 
-alias info='info --vi-keys'
+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='-Ri'
+export LESS='-RSi'
 
 # yes I'm that lazy
-alias o='mimeo'
-
-#systemd aliases
-alias sctl='systemctl'
-alias jctl='journalctl'
-#complete -F _systemctl sctl doesn't work with new bash-completion
+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/")'