X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=core%2F50_prompt%2F50_prompt.zshrc;h=5869f060826af3d7e90f400355a1636574014ab0;hb=deabaefbbaa1b0f62d7fbd78efe70507d87be50f;hp=bda0216e7aea890bc399d3fede694d721b5e5860;hpb=55d93ab7e7098bb819ba99af89cb2c7a47d865d5;p=ax-zsh.git diff --git a/core/50_prompt/50_prompt.zshrc b/core/50_prompt/50_prompt.zshrc index bda0216..5869f06 100644 --- a/core/50_prompt/50_prompt.zshrc +++ b/core/50_prompt/50_prompt.zshrc @@ -1,6 +1,11 @@ # AX-ZSH: Alex' Modular ZSH Configuration # 50_prompt.zshrc: Setup default prompts +# Some dummy functions (used by some OhMyZsh themes, for example) ... +git_prompt_info(){ true; } +git_prompt_status(){ true; } +rvm_prompt_info(){ true; } + # Logname ("user name") ZSH_THEME_LOGNAME_PROMPT_PREFIX_SPACING="" @@ -55,15 +60,9 @@ ax_hostname_prompt_functions=() # VCS if axzsh_is_utf_terminal; then - ZSH_THEME_BULLET_VCS_CLEAN="✔" - ZSH_THEME_BULLET_VCS_DIRTY="✘" - ZSH_THEME_BULLET_VCS_AHEAD="→" - ZSH_THEME_BULLET_VCS_BEHIND="←" + clean="✔"; dirty="✘"; ahead="→"; behind="←" else - ZSH_THEME_BULLET_VCS_CLEAN="+" - ZSH_THEME_BULLET_VCS_DIRTY="X" - ZSH_THEME_BULLET_VCS_AHEAD=">" - ZSH_THEME_BULLET_VCS_BEHIND="<" + clean="+"; dirty="x"; ahead=">"; behind="<" fi ZSH_THEME_VCS_PROMPT_PREFIX_SPACING="(" @@ -71,10 +70,12 @@ ZSH_THEME_VCS_PROMPT_PREFIX="%{$fg_no_bold[yellow]%}" ZSH_THEME_VCS_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_VCS_PROMPT_SUFFIX_SPACING=")" -ZSH_THEME_VCS_PROMPT_CLEAN=" %{$fg_no_bold[green]%}${ZSH_THEME_BULLET_VCS_CLEAN}" -ZSH_THEME_VCS_PROMPT_DIRTY=" %{$fg_no_bold[red]%}${ZSH_THEME_BULLET_VCS_DIRTY}" -ZSH_THEME_VCS_PROMPT_AHEAD="%{$fg_no_bold[cyan]%}${ZSH_THEME_BULLET_VCS_AHEAD}" -ZSH_THEME_VCS_PROMPT_BEHIND="%{$fg_no_bold[blue]%}${ZSH_THEME_BULLET_VCS_BEHIND}" +ZSH_THEME_VCS_PROMPT_CLEAN=" %{$fg_no_bold[green]%}$clean" +ZSH_THEME_VCS_PROMPT_DIRTY=" %{$fg_no_bold[red]%}$dirty" +ZSH_THEME_VCS_PROMPT_AHEAD="%{$fg_no_bold[cyan]%}$ahead" +ZSH_THEME_VCS_PROMPT_BEHIND="%{$fg_no_bold[blue]%}$behind" + +unset clean dirty ahead behind function ax_vcs_prompt() { local func