diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2022-08-09 19:26:42 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2022-08-09 19:26:42 +1200 |
| commit | 0c2476a09b3a5c727cac5571b6dd70cecf1d2712 (patch) | |
| tree | 8f3485c28c5b9d3b532caf3ab451288c1f8c0c23 /bash/bashrc.d/prompt.bash | |
| parent | Merge branch 'release/v12.18.0' (diff) | |
| parent | Update dotfiles(7) manual page (diff) | |
| download | dotfiles-0c2476a09b3a5c727cac5571b6dd70cecf1d2712.tar.gz dotfiles-0c2476a09b3a5c727cac5571b6dd70cecf1d2712.zip | |
Merge branch 'release/v12.19.0'v12.19.0
* release/v12.19.0:
Update dotfiles(7) manual page
Better way to elide hostname prompt in screen/tmux
Restore tmux history to defaults
Don't update tmux environment at all
Don't maintain GTK settings anymore
Diffstat (limited to 'bash/bashrc.d/prompt.bash')
| -rw-r--r-- | bash/bashrc.d/prompt.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index bdea7ace..e0a03438 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -14,9 +14,9 @@ prompt() { PROMPT_DIRTRIM=4 fi - # Basic prompt shape depends on whether we're in SSH or not + # Prompt has hostname via SSH outside of screen/tmux PS1= - if [[ -n $SSH_CLIENT || -n $SSH_CONNECTION ]] ; then + if [[ -n $SSH_CLIENT && -z $STY && -z $TMUX ]] ; then PS1=$PS1'\h:' fi PS1=$PS1'\w' |