From d5226b370c88c86762e125f3dc8a1d75e4c6571b Mon Sep 17 00:00:00 2001 From: lhark Date: Tue, 24 Nov 2015 21:33:49 +0100 Subject: [PATCH] Clean and comment prompt definition --- zshrc | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/zshrc b/zshrc index 13b2d7a..36540da 100644 --- a/zshrc +++ b/zshrc @@ -153,13 +153,13 @@ case ${SOLARIZED_THEME:-dark} in esac local ZSH_THEME_GIT_PROMPT_PREFIX="%{%K{${bkg}}$fg_bold[green]%}[%{$fg_bold[blue]%}" -local ZSH_THEME_GIT_PROMPT_SUFFIX="%{%K{${bkg}}$fg_bold[green]%}]%K{${bkg}}" -local ZSH_THEME_GIT_PROMPT_CLEAN="%{%K{${bkg}}$fg_bold[green]%}✓%{$reset_color%}" -local ZSH_THEME_GIT_PROMPT_AHEAD="%{%K{${bkg}}$fg[cyan]%}▴%{$reset_color%}" -local ZSH_THEME_GIT_PROMPT_BEHIND="%{%K{${bkg}}$fg[magenta]%}▾%{$reset_color%}" -local ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[green]%K{${bkg}}%}●%{$reset_color%}" -local ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg[yellow]%K{${bkg}}%}●%{$reset_color%}" -local ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[red]%K{${bkg}}%}●%{$reset_color%}" +local ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[green]%}]" +local ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_no_bold[green]%}✓" +local ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_no_bold[cyan]%}▴" +local ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg_no_bold[magenta]%}▾" +local ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_no_bold[green]%}●" +local ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_no_bold[yellow]%}●" +local ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_no_bold[red]%}●" local ZSH_THEME_VIRTUALENV_PREFIX=" %{$fg_bold[green]%}(%{%b%K{${bkg}}$fg[green]%}" local ZSH_THEME_VIRTUALENV_SUFFIX="%{$reset_color%K{${bkg}}$fg_bold[green]%})%{$reset_color%K{${bkg}}%}" @@ -305,19 +305,34 @@ setopt promptsubst # Prompt display # ################################################################################ +# Carriage return to give the prompt some air PROMPT="%{$reset_color%} " + +# Username, red when logged as root PROMPT+="%{%K{${bkg}}%}"'$_USERNAME' + +# @ symbol PROMPT+="%{$fg_bold[blue]%}@" + +# Hostname, colors defined just above PROMPT+="%{$fg_bold[$couleur_hote]%}"'%m' + +# White space to separate host from pwd PROMPT+=" %{$reset_color%K{${bkg}}%}" + +# Current working directory, use ~ when needed PROMPT+="%{$fg[yellow]%}"'%~' + +# Change the background for the whole line and line feed PROMPT+="%{$fg_bold[green]%} %E " -PROMPT+='%{%K{${bkg}}%}$(_prompt_chars) %{%k%}%{$reset_color%}' +# Prompt characters for virtualenv, git and zsh +PROMPT+="%{%K{${bkg}}%}$(_prompt_chars) %{$reset_color%}" -RPROMPT='$(space_sh_git_prompt)%E%{$reset_color%}' +# Right prompt with current repo informations +RPROMPT="$(space_sh_git_prompt)%E%{$reset_color%}" #PROMPT="$Heure $Utilisateur@$Machine %{$fg_no_bold[yellow]%}%~ #%{$reset_color%}%# "