awesome: delete unused volume_progressbar_widget

[dotfiles.git] / aliases

diff --git a/aliases b/aliases
index 821dd105e53ab5d8c2b6f08ccc9104ece1775d69..6fb1ae18bc3ef314a986d2de9fb62b8652636cef 100644 (file)
--- a/aliases
+++ b/aliases
@@ -2,6 +2,7 @@
 # this will allow aliasing any command after sudo
 alias sudo='sudo '
 
 # this will allow aliasing any command after sudo
 alias sudo='sudo '
 

+alias ls='ls --color=auto'

 alias l='ls --color=auto -F'
 alias ls='ls --color=auto -F'
 alias ll='ls -lh --color=auto -F'
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto -F'
 alias ll='ls -lh --color=auto -F'


@@ -12,26 +13,41 @@ alias df='df -h'                 # human-readable sizes
 du() { /usr/bin/du -h ${@} | sort -h }
 alias free='free -m'             # show sizes in MB
 
 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 "\e]51;[\"drop\", \"$f\"]\a"
+    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 vi='vim'
 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
 
 # colours, I want more colours

-alias diff='colordiff'
+[[ -x /usr/bin/colordiff ]] && alias diff='colordiff'

 
 # colours and case insensitive search
 
 # colours and case insensitive search

-export LESS='-Ri'
+export LESS='-RSi'

 
 # yes I'm that lazy
 
 # 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/")'
 
 # 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/")'