Merge remote branch 'rammstein/master'

[config/dotfiles.git] / shell / aliases

diff --git a/shell/aliases b/shell/aliases
index cb2af4b8c024a55b7fc35c63de2588d07fb827db..1e601c2da988ca6ad62fbb1e39be485c15c101e2 100644 (file)
--- a/shell/aliases
+++ b/shell/aliases
@@ -7,8 +7,9 @@ alias c='clear'
 alias e='elinks'
 alias g='git'
 alias m='mutt'
+alias p='less' # p for pager
+alias s='mpc'  # s for sound, m is already used
 alias v='vim'
-alias vi='vim'
 
 
 # Improved ls which displays the files in columns (-C), visualizes
@@ -48,7 +49,7 @@ if [ x$ls_color = xgnu ]; then
 # Normal ls with colors.
 elif [ x$ls_color = xcli ]; then
     ls() {
-        CLICOLOR_FORCE=1 my_ls $*
+        CLICOLOR_FORCE=1 my_ls -G $*
     }
 # Simple ls with no colors.
 else
@@ -61,12 +62,22 @@ unset ls_color
 la() {
     ls -a $*
 }
-# Helper function to list all files in list format with access rights, etc.
+# 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 $*
 }
 
 
+# Make going up directories simple.
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+alias .....='cd ../../../..'
+
 # I sometimes confuse editor and shell, print a warning to prevent I exit the
 # shell.
 alias :q='echo "This is not Vim!" >&2'