X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fshell%2Faliases.in;h=a4db8bfee044f0856faa3238e26d00d252eb294e;hb=246cb5f430f8846edefc28783cfa4197bd9034c2;hp=6d8997d15d2584280953a7c82890d7745c3c3f5c;hpb=f4b6a840a03304a034bf8336f4c08d7e0e127d73;p=config%2Fdotfiles.git

diff --git a/shell/shell/aliases.in b/shell/shell/aliases.in
index 6d8997d..a4db8bf 100644
--- a/shell/shell/aliases.in
+++ b/shell/shell/aliases.in
@@ -44,10 +44,15 @@ alias sa=ssh-add
 alias ta=task
 alias te=tree
 alias ti=timew
-# systemd ... (sc is provided as shell script for better completion)
-alias jc=journalctl
-alias lc=loginctl
-alias mc=machinectl
+
+# 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
@@ -74,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 -h "$@" 2>&1 | less
+    LS_ARGS -C -F -h "$@" 2>&1 | less -S
 }
 
 unalias ll lt la lal lat 2>/dev/null
@@ -115,7 +120,7 @@ alias grep='grep --color=auto'
 
 # Pipe output through less.
 tree() {
-    command tree -C "$@" | less
+    command tree -C "$@" | less -S
 }
 
 # Better viewer for info pages .. just pipe everything into less.
@@ -134,6 +139,13 @@ if test "`id -u`" -eq 0; then
 fi
 
 # Use short `ip` output per default.
-alias ip='ip -br'
+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