X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fshell%2Faliases.in;h=039c11a653845f33913302c8cbe268bd575c3af3;hb=7eefe68ca1e53cf7e7a5ec3c49f681650daac71e;hp=294467d2adcf8079fb10045b81982f8878d18e88;hpb=f92970f4a27cb6e8ce83161a8b894f234c66bf57;p=config%2Fdotfiles.git

diff --git a/shell/shell/aliases.in b/shell/shell/aliases.in
index 294467d..039c11a 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
@@ -118,6 +123,16 @@ tree() {
     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.
 info() {
     command info "$@" 2>/dev/null | less
@@ -134,6 +149,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