X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Faliases.in;h=69270ccfc261dd4704bda7a20153ff08f6941935;hb=68334b23c7783d48794aa3ec140cc6aa19a9bbb2;hp=da44147923bb173e5f30f48fbd142c85f64da121;hpb=24ec064a7aa54ae8e5714b3f717f7ab5e40f20f3;p=config%2Fdotfiles.git

diff --git a/shell/aliases.in b/shell/aliases.in
index da44147..69270cc 100644
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -1,7 +1,7 @@
 # Aliases and similar functions which can be used by all shells (supporting
 # them).
 
-# Copyright (C) 2011-2014  Simon Ruderich
+# Copyright (C) 2011-2015  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,16 +22,33 @@ alias c=clear
 alias d=cd
 alias e=elinks
 alias g=git
+alias h=htop
 alias l=ls
 alias m=make
 alias p=less # p for pager
+alias s=ssh
 alias t=tig
 alias v=vim
+alias x=exit
 # Shortcuts for a little less used programs.
+alias ga='git annex'
+alias gr=grep
+alias gri='grep -i'
+alias grr='grep -r'
+alias grri='grep -ri'
+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 te=tree
+# systemd ... (sc is provided as shell script for better completion)
+alias jc=journalctl
+alias lc=loginctl
+alias mc=machinectl
 
 
-unalias mv cp 2> /dev/null
+unalias mv cp 2>/dev/null
 # Ask for confirmation before overwriting files. Especially useful when moving
 # to a different directory. No alias for `rm` because I specify the files to
 # remove directly, so I know what will happen.
@@ -52,10 +69,10 @@ unalias ls 2>/dev/null
 # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
 # pager. If none work no colors are used.
 #
-# See `setup.sh` for details. LS_ENV and LS_COLOR are replaced with the
-# correct values when this file is generated.
+# See `setup.sh` for details. LS_* are replaced with the appropriate values
+# when this file is generated.
 ls() {
-    LS_ENV command ls LS_COLOR -C -F "$@" 2>&1 | less
+    LS_ARGS -C -F "$@" 2>&1 | less
 }
 
 unalias ll lt la lal lat 2>/dev/null
@@ -104,4 +121,14 @@ info() {
     command info "$@" 2>/dev/null | less
 }
 
+# Using su (or sudo) as root to a less privileged user might allow the other
+# user to run arbitrary commands as root. See also Debian bugs #628843 and
+# #657784.
+if test "`id -u`" -eq 0; then
+    su() {
+        echo 'never su as root' >&2
+        return 1
+    }
+fi
+
 # vim: ft=sh