Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/zsh

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

diff --git a/.zsh/zshrc/80_prompt b/.zsh/zshrc/80_prompt
index cdde4daa6797c1f51aaddf5c3ffcfdabd47ec3fb..95ea67d64dfc7378a45ec6227929a70537e47532 100644 (file)
--- a/.zsh/zshrc/80_prompt
+++ b/.zsh/zshrc/80_prompt
@@ -1,4 +1,4 @@
-# zshrc/90_prompt
+# zshrc/80_prompt

 #
 # Formats the shell prompt
 #
 #
 # Formats the shell prompt
 #


@@ -8,15 +8,19 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 

-_MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+local _PS1_HL

 if is_root; then
   _MIDDLE="%25<..<%~%<<"
   _PS1_HL=U
 fi
 if is_root; then
   _MIDDLE="%25<..<%~%<<"
   _PS1_HL=U
 fi

-PS1="%${_PS1_HL:=B}%m%${(L)_PS1_HL}:${_MIDDLE}%# "
-unset _PS1_HL
-unset _MIDDLE

 
 

+_MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
+_MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/$debian_chroot}"
+
+PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "

 RPS1="#%(0?..%?,)%!"
 
 RPS1="#%(0?..%?,)%!"
 

+unset _MACHINE_NAME
+

 # vim:ft=zsh
 # vim:ft=zsh