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

diff --git a/shell/aliases.in b/shell/aliases.in
index 55f02fe..2c80bb2 100644
--- a/shell/aliases.in
+++ b/shell/aliases.in
@@ -25,10 +25,19 @@ alias g=git
 alias l=ls
 alias m=mutt
 alias p=less # p for pager
-alias s=mpc  # s for sound, m is already used
 alias v=vim
 
 
+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.
+alias mv='mv -i'
+# Additionally preserve all file attributes when copying, this includes
+# copying symbolic links as is without dereferencing them.
+alias cp='cp -i -a'
+
+
 # Make sure there is no alias named ls as it causes problems with the
 # following ls function on (at least) bash 4.0.35.
 unalias ls 2> /dev/null
@@ -46,18 +55,17 @@ 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 lt la lal lat 2> /dev/null
+# List the files in list format with access rights, etc.
+alias ll='ls -l'
+# List the files sorted by last modification date.
+alias lt='ls -l -t'
+# List all files.
+alias la='ls -a'
+# List all files in list format with access rights, etc.
+alias lal='ls -al'
+# List all files sorted by last modification date.
+alias lat='ls -al -t'
 
 
 # Make going up directories simple.
@@ -73,11 +81,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'