10_terminal: Set terminal title and working directory in one function

diff --git a/core/10_terminal/10_terminal.zshrc b/core/10_terminal/10_terminal.zshrc
index 5ac08f79c9c46227e5bb2457d38f2dc9d39b1696..7a5538db88f81e50ae45129fd48bd7beaa834acb 100644 (file)
--- a/core/10_terminal/10_terminal.zshrc
+++ b/core/10_terminal/10_terminal.zshrc
@@ -3,22 +3,17 @@
 
 # Set terminal title
 
-function axzsh_terminal_precmd {
-       printf '\e]1;%s\a' "$LOGNAME@$SHORT_HOST"
-}
-
-precmd_functions+=(axzsh_terminal_precmd)
-
-# Set current working directory
-
-function axzsh_terminal_cwd {
+function axzsh_terminal_title_precmd {
        if [[ $TERM_PROGRAM == Apple_Terminal ]]; then
-               local url="file://$HOSTNAME${PWD// /%20}"
+               local url=$(echo "file://$HOSTNAME$PWD" | sed -e 's| |%20|g')
                printf '\e]7;%s\a' "$url"
+               printf '\e]0;%s\a' "$LOGNAME@$SHORT_HOST"
+       else
+               printf '\e]0;%s\a' "$LOGNAME@$SHORT_HOST:$PWD"
        fi
 }
 
-precmd_functions+=(axzsh_terminal_cwd)
+precmd_functions+=(axzsh_terminal_title_precmd)
 
 # Colors