X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fshell%2Faliases.in;h=039c11a653845f33913302c8cbe268bd575c3af3;hb=HEAD;hp=69270ccfc261dd4704bda7a20153ff08f6941935;hpb=6ca1d9bd09d69a729b389694866006c985eba3e0;p=config%2Fdotfiles.git

diff --git a/shell/shell/aliases.in b/shell/shell/aliases.in
index 69270cc..039c11a 100644
--- a/shell/shell/aliases.in
+++ b/shell/shell/aliases.in
@@ -40,12 +40,19 @@ alias mc='make clean'
 alias mj='make -j$(nproc)'
 alias mu=mutt
 alias rs=reset # like git's reset alias
-alias sa='ssh-add -t 1h'
+alias sa=ssh-add
+alias ta=task
 alias te=tree
-# systemd ... (sc is provided as shell script for better completion)
-alias jc=journalctl
-alias lc=loginctl
-alias mc=machinectl
+alias ti=timew
+
+# systemd ... (sc is provided as shell script for better completion); redirect
+# stderr because my color-stderr hack breaks systemd's terminal detection.
+jc() {
+    journalctl "$@" 2>&1
+}
+lc() {
+    loginctl "$@" 2>&1
+}
 
 
 unalias mv cp 2>/dev/null
@@ -62,8 +69,8 @@ alias cp='cp -i -a'
 # following ls function on (at least) bash 4.0.35.
 unalias ls 2>/dev/null
 # Improved ls which displays the files in columns (-C), visualizes
-# directories, links and other special files (-F) and pages everything through
-# less.
+# directories, links and other special files (-F), uses human file sizes (-h)
+# and pages everything through less.
 #
 # If available use GNU ls with colorized output. If it isn't available try
 # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
@@ -72,7 +79,7 @@ unalias ls 2>/dev/null
 # See `setup.sh` for details. LS_* are replaced with the appropriate values
 # when this file is generated.
 ls() {
-    LS_ARGS -C -F "$@" 2>&1 | less
+    LS_ARGS -C -F -h "$@" 2>&1 | less -S
 }
 
 unalias ll lt la lal lat 2>/dev/null
@@ -113,7 +120,17 @@ alias grep='grep --color=auto'
 
 # Pipe output through less.
 tree() {
-    command tree -C "$@" | less
+    command tree -C "$@" | less -S
+}
+
+# Groff versions >= 1.23 don't support LESS_TERMCAP_* to color man pages, set
+# GROFF_NO_SGR as workaround. Also set LANG to C so that hyphens are not
+# replaced with unicode making it impossible to search for options containg
+# "-" or "--" in many man pages (these are errors in the man page but very
+# common; Debian reverted this behavior in 1.23.0-3 but other distributions
+# might not).
+man() {
+    GROFF_NO_SGR=1 LANG=C command man "$@"
 }
 
 # Better viewer for info pages .. just pipe everything into less.
@@ -131,4 +148,14 @@ if test "`id -u`" -eq 0; then
     }
 fi
 
+# Use short `ip` output per default.
+alias ip='ip -brief -color=auto'
+
+# Calendar with traditional output (-b), weeks starting on Monday (-M), week
+# numbers (-w) and the previous, current and next month (-3)
+alias cal='ncal -b -M -w -3'
+
+# Group volumes on mdadm devices instead of displaying them multiple times
+alias lsblk='lsblk --merge'
+
 # vim: ft=sh