X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/468df93c1412b92a48b1e29917f913dee711176b..b47ffe60e244c9165f40371736079320ea2d848b:/aliases

diff --git a/aliases b/aliases
index 74f175c..e7b0a12 100644
--- a/aliases
+++ b/aliases
@@ -2,45 +2,54 @@
 # 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'                          # confirm before overwriting something
-alias df='df -h'                          # human-readable sizes
-alias free='free -m'                      # show sizes in MB
-
-alias vi='vim'
-alias svi='sudo vim'
+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
+
+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 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'
 
-#systemd aliases
-alias sctl='systemctl'
-#complete -F _systemctl sctl doesn't work with new bash-completion
+# yes I'm that lazy
+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/")'
 
 # packaging
 alias :cp='rm -rf pkg src dbg hdr log logpipe* *.log.* *.log *.pkg.*'
-
-# Pacman alias examples
-alias pacupg='sudo pacman -Syu'
-alias pacin='sudo pacman -S'
-alias pacu='sudo pacman -U'
-alias pacre='sudo pacman -R'
-alias pacrem='sudo pacman -Rns'
-alias pacrep='pacman -Si'
-alias pacreps='pacman -Ss'
-alias pacloc='pacman -Qi'
-alias paclocs='pacman -Qs'