Streamline default values of AX-ZSH theming variables

diff --git a/core/50_prompt/50_prompt.zshrc b/core/50_prompt/50_prompt.zshrc
index a315e663dc86cfb43f51095ab53a1de6b0e826d0..4dda1f720bc5395006644b0d6a1c57131618ef58 100644 (file)
--- a/core/50_prompt/50_prompt.zshrc
+++ b/core/50_prompt/50_prompt.zshrc
@@ -4,10 +4,13 @@
 # Logname ("user name")
 
 ZSH_THEME_LOGNAME_PROMPT_PREFIX_SPACING=""
-(( $UID == 0 )) \
-       && ZSH_THEME_LOGNAME_PROMPT_PREFIX="%{$fg_no_bold[red]%}" \
-       || ZSH_THEME_LOGNAME_PROMPT_PREFIX=""
-ZSH_THEME_LOGNAME_PROMPT_SUFFIX="%{$reset_color%}"
+if (( $UID == 0 )); then
+       ZSH_THEME_LOGNAME_PROMPT_PREFIX="%{$fg_no_bold[red]%}" \
+       ZSH_THEME_LOGNAME_PROMPT_SUFFIX="%{$reset_color%}"
+else
+       ZSH_THEME_LOGNAME_PROMPT_PREFIX=""
+       ZSH_THEME_LOGNAME_PROMPT_SUFFIX=""
+fi
 ZSH_THEME_LOGNAME_PROMPT_SUFFIX_SPACING="@"
 
 function ax_logname_prompt_root() {
@@ -30,8 +33,8 @@ ax_logname_prompt_functions=()
 
 ZSH_THEME_HOSTNAME_PROMPT_PREFIX_SPACING=""
 ZSH_THEME_HOSTNAME_PROMPT_PREFIX=""
-ZSH_THEME_HOSTNAME_PROMPT_SUFFIX="%{$reset_color%}:"
-ZSH_THEME_HOSTNAME_PROMPT_SUFFIX_SPACING=""
+ZSH_THEME_HOSTNAME_PROMPT_SUFFIX=""
+ZSH_THEME_HOSTNAME_PROMPT_SUFFIX_SPACING=":"
 
 function ax_hostname_prompt_root() {
        (( $UID == 0 )) || return 1

diff --git a/themes/ax.axzshtheme b/themes/ax.axzshtheme
index 53d46baba4d30157926209960af643be23ed0ea1..a3381167f87883b01b7b36c2c19d46838e485c85 100644 (file)
--- a/themes/ax.axzshtheme
+++ b/themes/ax.axzshtheme
@@ -3,11 +3,15 @@
 
 ZSH_THEME_VCS_PROMPT_SUFFIX_SPACING=") "
 
+ZSH_THEME_PROMPT_PREFIX="%{$fg_no_bold[green]%}%B"
+ZSH_THEME_PROMPT_ROOT_PREFIX="%{$fg_no_bold[red]%}%B"
+ZSH_THEME_PROMPT_SUFFIX="%b%{$reset_color%}"
+
 ax_logname_prompt_functions=($ax_logname_prompt_functions ax_logname_prompt_root)
 ax_hostname_prompt_functions=($ax_hostname_prompt_functions ax_hostname_prompt_root)
 
 # Default prompt
-PS1="$(ax_logname_prompt_yn)$(ax_hostname_prompt_yn)%B%2~%b "'$(ax_vcs_prompt)'"%{$fg_no_bold[green]%}%B\$%b%{$reset_color%} "
+PS1="$(ax_logname_prompt_yn)$(ax_hostname_prompt_yn)%B%2~%b "'$(ax_vcs_prompt)'"$(ax_prompt) "
 
 # Prompt on right side
 RPS1="%(?..%{$fg_no_bold[red]%}%? ↵%{$reset_color%})"