setup.sh: simplify ls detection

[config/dotfiles.git] / shell / aliases.in

diff --git a/shell/aliases.in b/shell/aliases.in
index 06d7277bc0e4627c7197747e5da1c8507cb2beed..2848f737b02f8249c6cffd9e75723a11339d39ab 100644 (file)
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -31,6 +31,7 @@ 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'
@@ -38,6 +39,7 @@ alias grri='grep -ri'
 alias mc='make clean'
 alias mj='make -j'
 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 completoin)
@@ -69,7 +71,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_ENV command ls LS_COLOR LS_OPTIONS -C -F "$@" 2>&1 | less
+    LS_ARGS -C -F "$@" 2>&1 | less
 }
 
 unalias ll lt la lal lat 2>/dev/null