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

diff --git a/shell/aliases.in b/shell/aliases.in
index fa76162..27ce92c 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-2012  Simon Ruderich
+# Copyright (C) 2011-2013  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
@@ -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,15 +68,16 @@ 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'
 
-# Edit the mercurial patch queue series file for the current mercurial
-# repository in Vim. Also change Vim's pwd to the patches directory so other
-# patches can easily be opened.
-alias vqs='vim -c "cd `hg root`/.hg/patches/" "`hg root`/.hg/patches/series"'
+# Highlight matched strings. Doesn't work with a pager!
+alias grep='grep --color=auto'
 
 # vim: ft=sh