Unfuck ls alias.

[zshconf.git] / zshrc

diff --git a/zshrc b/zshrc
index 9878649eb724c943e45d8394effaec0bf5c0d764..10edaa9f8941fa6787c7b8f77aa58a090d88cf12 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -7,6 +7,9 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+# Default shell options
+setopt EXTENDED_GLOB
+
 if [[ -n $HOME ]]; then
        HISTFILE=$HOME/.zsh_history
        SAVEHIST=10000
@@ -17,7 +20,7 @@ bindkey -e
 
 case $TERM in
 rxvt*)
-       if [[ $TERM == rxvt-unicode ]]; then
+       if [[ $TERM =~ '^rxvt-unicode' ]]; then
                [[ -z $COLORTERM ]] && export COLORTERM='rxvt-xpm'
                [[ -z $COLORFGBG ]] && export COLORFGBG='15;default;0'
        fi
@@ -26,13 +29,13 @@ rxvt*)
        bindkey '\e[8~' end-of-line
        bindkey '\e[7~' beginning-of-line
 ;;
-screen*|linux)
+screen*|linux|cygwin)
        bindkey '\e[3~' delete-char
        bindkey '\e[4~' end-of-line
        bindkey '\e[1~' beginning-of-line
        bindkey '\eOM'  accept-line
 ;;
-xterm)
+xterm*)
        bindkey '\e[3~' delete-char
        bindkey '\e[F'  end-of-line
        bindkey '\e[H'  beginning-of-line
@@ -100,10 +103,15 @@ export LANG=en_CA.UTF-8
 export LC_COLLATE=ja_JP.UTF-8
 
 # Default options for various utilities.
-alias ls='ls --time-style=long-iso --color=auto'
+alias ls='ls -N --time-style=long-iso --color=auto'
 alias grep='grep --color=auto'
 
 # I hate mistakes
 alias mv='mv -i'
 alias rm='rm -i'
 alias cp='cp -i'
+
+# Common aliases
+alias vv='$EDITOR ~/.zshrc && source ~/.zshrc'
+alias ll='ls -l'
+alias lr='ls -rtl'