X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.zsh%2Fzshrc%2F85_prompt;h=29fdab7e4799e971c801e4229c406b043e08db3c;hb=HEAD;hp=2adad06585c3b30aa65753ab5e2eebdb1997f82d;hpb=328d4d97334afe75d74d322da1a2459a43136174;p=zsh.git diff --git a/.zsh/zshrc/85_prompt b/.zsh/zshrc/85_prompt index 2adad06..29fdab7 100644 --- a/.zsh/zshrc/85_prompt +++ b/.zsh/zshrc/85_prompt @@ -1,4 +1,5 @@ # -*- mode: sh -*- +# -*- mode: sh -*- # zshrc/80_prompt # # Formats the shell prompt @@ -8,22 +9,30 @@ # # Source repository: git://git.madduck.net/etc/zsh.git # +if [ -n "$SSH_CLIENT" ]; then + machine_color="orange" +else + machine_color="green" +fi; + + +PS1="%{$fg[$machine_color]%}%n@%m %{$fg[green]%}%* %{$fg[yellow]%}%25<…<%~%<<%{$reset_color%}%# " + +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 + +: ${RPS1:="#%(0?..%?,)%! [%l]"} -PS1="%{$fg[green]%}%n@%m %{$fg[green]%}%* %{$fg[yellow]%}%25<…<%~%<<%{$reset_color%}%# " - -# 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 -# -# : ${RPS1:="#%(0?..%?,)%!"} +RPROMPT='%{$fg_no_bold[green]%}${vcs_info_msg_0_}%{$reset_color%}' # vim:ft=zsh