X-Git-Url: https://git.draconx.ca/gitweb/zshconf.git/blobdiff_plain/dfcbd6b054a251e4d9fd17fac2d9af99a4632b29..7b2404393c216c6d9f3da1bb2a16f0dd90054987:/zshrc

diff --git a/zshrc b/zshrc
index a918905..b61eb5c 100644
--- 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,12 +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
@@ -106,3 +110,8 @@ alias grep='grep --color=auto'
 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'