X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=0370fb00d8ddf720ae4949e05551af5ce9f044b2;hb=f3e6d64626a67c78f0a8bf401fe7478011a541a4;hp=278b66003dc58ed3217bd509787bd6612bc2136a;hpb=bfc1858331da7f787084292c2277a09f5467c53c;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 278b660..0370fb0 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)
@@ -144,6 +146,10 @@ 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.
@@ -180,8 +186,9 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
                 ;;
         esac
 
-        # Add an exclamation mark at the beginning if running with sudo.
-        if [[ $program_sudo == yes ]]; then
+        # Add an exclamation mark at the beginning if running with sudo or if
+        # running zsh as root.
+        if [[ $program_sudo == yes || $window_root == yes ]]; then
             program_name=!$program_name
         fi
 
@@ -205,6 +212,8 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         # Reset the window name to 'zsh'.
         if [[ -n $SSH_CONNECTION ]]; then
             window_title "@zsh"
+        elif [[ $window_root == yes ]]; then
+            window_title "!zsh"
         else
             window_title "zsh"
         fi