X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=e6a27ef5f85aebf98494ee68361d5daf51531f7a;hb=b5a0a1c1fd6785ae87d27d043063c75dfedcd367;hp=736fbcd4f82c4eeb4951cd1cd54dd5cded315a91;hpb=62d757146f6bcf1f4951059769239db024144812;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 736fbcd..e6a27ef 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,6 +150,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,9 +190,16 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
                 ;;
         esac
 
-        # Add an exclamation mark at the beginning if running with sudo.
-        if [[ $program_sudo == yes ]]; then
-            program_sudo=!$program_sudo
+        # 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
+
+        # 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.
@@ -197,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 [[ $window_root == yes ]]; then
+            window_title "!zsh"
+        else
+            window_title "zsh"
+        fi
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=