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

diff --git a/shell/shell/aliases.in b/shell/shell/aliases.in
index a2f0341..a4db8bf 100644
--- a/shell/shell/aliases.in
+++ b/shell/shell/aliases.in
@@ -44,9 +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
+
+# 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
@@ -133,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