X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=e5d41202b833274aa29ef8a755e998bda8f8d256;hb=9155b43f447c52252d6930d856296aaf85b37afc;hp=f936b91ad2144408044479d5b12334a355a4faff;hpb=043a26ea99d84d11423b2dc53949a2df518d2c35;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index f936b91..e5d4120 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -32,6 +32,8 @@ setopt ignoreeof
 
 # FUNCTION SETTINGS
 
+# Make sure every entry in $fpath is unique.
+typeset -U fpath
 # Set correct fpath to allow loading my functions (including completion
 # functions).
 fpath=(~/.zsh/functions $fpath)
@@ -135,6 +137,10 @@ fi
 # It works with screen and xterm. If screen is running in X11 (DISPLAY is set)
 # and stumpwm is used (it's tested if stumpish is available) then the window
 # title is also set in stumpwm using stumpish.
+#
+# If a command is run with sudo or if the shell is running as root then a ! is
+# added at the beginning of the command to make this clear. If a command is
+# running on a different computer with ssh a @ is added at the beginning.
 if [[ $TERM == screen* || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
@@ -144,14 +150,21 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
     if [[ $? -eq 0 ]]; then
         window_stumpwm=yes
     fi
+    # Set to a non empty value when the shell is running as root.
+    if [[ $(id -u) -eq 0 ]]; then
+        window_root=yes
+    fi
 
     window_preexec() {
         # Get the program name with its arguments.
         local program_name=$1
+
         # When sudo is used use real program name instead, but with an
         # exclamation mark at the beginning.
+        local program_sudo=
         if [[ $program_name == sudo* ]]; then
-            program_name=!${program_name#sudo }
+            program_name=${program_name#sudo }
+            program_sudo=yes
         fi
         # Remove all arguments from the program name.
         program_name=${program_name%% *}
@@ -177,6 +190,18 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
                 ;;
         esac
 
+        # Add an exclamation mark at the beginning if running with sudo or if
+        # running zsh as root.
+        if [[ -n $program_sudo || -n $window_root ]]; then
+            program_name=!$program_name
+        fi
+
+        # Add an at mark at the beginning if running ssh on a different
+        # computer.
+        if [[ -n $SSH_CONNECTION ]]; then
+            program_name="@$program_name"
+        fi
+
         # Set the window name to the currently running program.
         window_title "$program_name"
 
@@ -189,7 +214,13 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
-        window_title "zsh"
+        if [[ -n $SSH_CONNECTION ]]; then
+            window_title "@zsh"
+        elif [[ -n $window_root ]]; then
+            window_title "!zsh"
+        else
+            window_title "zsh"
+        fi
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=
@@ -272,12 +303,17 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
+# Redirect stderr to stdout.
+alias -g E='2>&1'
+
 # Simplify calls to less, automatically redirects all output.
-alias -g L='2>&1 | less'
+alias -g L='E | less'
 # Simplify calls to colordiff, output is also piped through less.
-alias -g D='2>&1 | colordiff L'
+alias -g D='E | colordiff L'
 # Simplify calls to grep.
 alias -g G='| grep'
+# Simplify calls to sort.
+alias -g S='| sort'
 
 # Automatically use unified diffs.
 alias diff='diff -u'