X-Git-Url: https://git.draconx.ca/gitweb/zshconf.git/blobdiff_plain/7c2d945d450b7ce24bf08572222765139502a7e5..590f3449add396e5dc77275df6fbf6014cb7a4e2:/zshrc

diff --git a/zshrc b/zshrc
index 92842a7..7f5a3b3 100644
--- a/zshrc
+++ b/zshrc
@@ -17,7 +17,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 +26,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
@@ -45,6 +46,14 @@ cons25)
 ;;
 esac
 
+# Keymap-specific bindings
+case $KEYMAP in
+colemak)
+	bindkey '^R'    history-incremental-search-forward
+	bindkey '^P'    history-incremental-search-backward
+	;;
+esac
+
 # Set the xterm title
 case $TERM in
         xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
@@ -90,11 +99,16 @@ fi
 export LANG=en_CA.UTF-8
 export LC_COLLATE=ja_JP.UTF-8
 
-# I like colours
-alias ls='ls --color=auto'
+# Default options for various utilities.
+alias ls='ls --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'