X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Faliases.in;h=27ce92c8b9b7252bd3b7cbeab310135d28bd790e;hb=41ea59fcb1a20d7ab6df9aad1552243dea7d52b0;hp=55f02fea86c0cb5194418a1f5021d9ebdd7d7135;hpb=72c2497c04ef7567b44c0a7d602607981242b0b7;p=config%2Fdotfiles.git

diff --git a/shell/aliases.in b/shell/aliases.in
index 55f02fe..27ce92c 100644
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -46,18 +46,13 @@ ls() {
     LS_ENV LS_PATH LS_COLOR -C -F "$@" 2>&1 | less
 }
 
-# Helper function to list all files.
-la() {
-    ls -a "$@"
-}
-# Helper function to list the files in list format with access rights, etc.
-ll() {
-    ls -l "$@"
-}
-# Helper function to list all files in list format with access rights, etc.
-lal() {
-    la -l "$@"
-}
+unalias ll la lal 2> /dev/null
+# List the files in list format with access rights, etc.
+alias ll='ls -l'
+# List all files.
+alias la='ls -a'
+# List all files in list format with access rights, etc.
+alias lal='ls -al'
 
 
 # Make going up directories simple.
@@ -73,11 +68,14 @@ alias :q='echo "This is not Vim!" >&2'
 # Automatically use unified diffs.
 alias diff='diff -u'
 
+# COLUMN is set to `| column -t` if it's available, empty otherwise.
+
 # Display all files (-s), use human readable sizes (-h) and display the
 # complete size (-c).
 alias du='du -shc'
-# Use human readable sizes.
-alias df='df -h'
+# Use human readable sizes and format it nicely, thanks to climagic
+# (http://twitter.com/climagic/status/49623386762129408).
+alias df='df -hP COLUMN'
 
 # Highlight matched strings. Doesn't work with a pager!
 alias grep='grep --color=auto'