setup.sh: simplify ls detection

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

diff --git a/shell/aliases.in b/shell/aliases.in
index e99d5f748bd9d2c86f7ab4c75961ccaff9f58cc9..2848f737b02f8249c6cffd9e75723a11339d39ab 100644 (file)
--- 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,13 +22,29 @@ 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'
 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)
+alias jc=journalctl
+alias lc=loginctl
 
 
 unalias mv cp 2>/dev/null
@@ -55,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