integrate local changes

[etc/zsh.git] / .zsh / zshrc / 80_prompt

diff --git a/.zsh/zshrc/80_prompt b/.zsh/zshrc/80_prompt
index dfedff944b7f523c1425dfa77ea593dffd265ed2..54d0e4d25b67e4dbd7166a364e69347bf2605451 100644 (file)
--- a/.zsh/zshrc/80_prompt
+++ b/.zsh/zshrc/80_prompt
@@ -8,13 +8,19 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
-local _PS1_HL
-if is_root; then
-  _MIDDLE="%25<..<%~%<<"
-  _PS1_HL=U
+if [ "${PS1:-}" = '%m%# ' ]; then
+  local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+  if is_root; then
+    _MIDDLE="%25<..<%~%<<"
+    local _PS1_HL=U
+  fi
+
+  local _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
+  _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/%S$debian_chroot%s}"
+
+  PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "
 fi
-PS1="%${_PS1_HL:=B}%m%${(L)_PS1_HL}:${_MIDDLE}%# "
-RPS1="#%(0?..%?,)%!"
+
+: ${RPS1:="#%(0?..%?,)%!"}
 
 # vim:ft=zsh