X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=ef32525f23f4c19cb147d40a9a70006c1ed6e340;hb=22247354cceff65512811106f28f81861c49a62c;hp=0e1e2c9023fe8eb749d4d5bc1e6900a684b13616;hpb=2f5a072302b720721ebcccdc8375f10d97a72162;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 0e1e2c9..ef32525 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -5,9 +5,6 @@ source_debug "sourcing ~/.zsh/rc"
 
 # MISCELLANEOUS SETTINGS
 
-# Use Vi(m) style key bindings.
-bindkey -v
-
 # Be paranoid, new files are readable/writable by me only.
 umask 077
 
@@ -33,6 +30,22 @@ setopt extendedglob
 setopt ignoreeof
 
 
+# KEY BINDINGS
+
+# Not all bindings are done here, only those not specific to a given section.
+
+# Use Vi(m) style key bindings.
+bindkey -v
+
+# Also use jj to exit insert mode.
+bindkey 'jj' vi-cmd-mode
+
+# I don't need the arrow keys, I use ^N and ^P for this (see below).
+bindkey -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
+# Also not in Vi mode.
+bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
+
+
 # FUNCTION SETTINGS
 
 # Make sure every entry in $fpath is unique.
@@ -313,13 +326,13 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         fi
 
         # Prepend prefixes like in window_preexec().
+        if [[ -n $window_root ]]; then
+            name="!$name"
+        fi
         if [[ -n $SSH_CONNECTION ]]; then
-            window_title "@$name"
-        elif [[ -n $window_root ]]; then
-            window_title "!$name"
-        else
-            window_title $name
+            name="@$name"
         fi
+        window_title $name
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=
@@ -334,6 +347,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         window_title() {
             print -n "\e]2;$1\e\\"
         }
+    else
+        # Fallback if another TERM is used.
+        window_title() { }
     fi
 
     # Add the preexec() and precmd() hooks.
@@ -413,10 +429,11 @@ TRAPINT() {
 # Colorize stderr. Very useful when looking for errors. Thanks to
 # http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
 # Freenode (2010-03-07 04:03) for some improvements (-r, printf). It's not yet
-# perfect and doesn't work with some interactive stderr output, but in those
+# perfect and doesn't work with su and git for example, but it can handle most
+# interactive output quite well (even with no trailing new line) and in those
 # cases the E alias can be used as workaround.
-exec 2>>(while read -r line; do
-    printf '\e[91m%s\e[0m\n' "$line"
+exec 2>>(while read -r -k -u 0 line; do
+    printf '\e[91m%s\e[0m' "$line";
     print -n $'\0';
 done &)