]> git.madduck.net Git - etc/zsh.git/blobdiff - .zsh/zshrc/80_prompt

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

set GIT_WORK_TREE just to be sure
[etc/zsh.git] / .zsh / zshrc / 80_prompt
index cdde4daa6797c1f51aaddf5c3ffcfdabd47ec3fb..a2b18eb250d17b81c5fc8b327258bffe9e005382 100644 (file)
@@ -1,4 +1,4 @@
-# zshrc/90_prompt
+# zshrc/80_prompt
 #
 # Formats the shell prompt
 #
@@ -8,15 +8,23 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-_MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
-if is_root; then
-  _MIDDLE="%25<..<%~%<<"
-  _PS1_HL=U
+if [ "${PS1:-}" = '%m%# ' ]; then
+  _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+  if is_root; then
+    _MIDDLE="%25<..<%~%<<"
+    _PS1_HL=U
+  fi
+
+  _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
+  _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/%S$debian_chroot%s}"
+
+  PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "
+
+  unset _MACHINE_NAME
+  unset _PS1_HL
+  unset _MIDDLE
 fi
-PS1="%${_PS1_HL:=B}%m%${(L)_PS1_HL}:${_MIDDLE}%# "
-unset _PS1_HL
-unset _MIDDLE
 
-RPS1="#%(0?..%?,)%!"
+: ${RPS1:="#%(0?..%?,)%!"}
 
 # vim:ft=zsh