X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=c0a453e4b01e026f6e10f4f4e95f567822d8c414;hb=4ec19d0e9a84b5155885e47908d7974d191f9492;hp=6db7057fe330ed76dcfe298e32743ccc303847c2;hpb=77fde5044a714adda614fe1ba5e4cd90b58300ae;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 6db7057..c0a453e 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -227,8 +227,10 @@ unset red blue green yellow default
 #
 # 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. This
-# only works if the .zshrc on the server also uses this command.
+# running on a different computer with ssh a @ is added at the beginning. If
+# screen is running on the remote machine instead of @screen @:hostname
+# (hostname replaced by the machine's hostname) is displayed. This only works
+# if the .zshrc on the server also uses this command.
 if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     # Is set to a non empty value to reset the window name in the next
     # precmd() call.
@@ -283,6 +285,12 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         # different computer.
         if [[ -n $SSH_CONNECTION ]]; then
             program_name="@$program_name"
+
+            # If screen is running in SSH then display "@:hostname" as title
+            # in the term/outer screen.
+            if [[ $program_name == @screen ]]; then
+                program_name="@:${$(hostname)//.*/}"
+            fi
         fi
 
         # Set the window name to the currently running program.
@@ -318,14 +326,15 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     }
 
     # Sets the window title. Works with screen, xterm and rxvt.
-    window_title() {
-        if [[ $TERM == screen* ]]; then
+    if [[ $TERM == screen* ]]; then
+        window_title() {
             print -n "\ek$1\e\\"
-
-        elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
+        }
+    elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
+        window_title() {
             print -n "\e]2;$1\e\\"
-        fi
-    }
+        }
+    fi
 
     # Add the preexec() and precmd() hooks.
     add-zsh-hook preexec window_preexec
@@ -426,6 +435,8 @@ alias -g D='E | colordiff L'
 alias -g G='| grep'
 alias -g S='| sort'
 alias -g U='| uniq'
+alias -g H='| head'
+alias -g T='| tail'
 
 # Make going up directories simple.
 alias -g ...='../..'