Correctly test XDG_CACHE_HOME for writability for "stamp files"

[ax-zsh.git] / themes / axemoji.axzshtheme

diff --git a/themes/axemoji.axzshtheme b/themes/axemoji.axzshtheme
index eeb05f16ea994cd311d30bc1d1a3576fd07d240e..9333e0ecbf660fbcf0b92ab8f2d634e4b9bf383d 100644 (file)
--- a/themes/axemoji.axzshtheme
+++ b/themes/axemoji.axzshtheme
@@ -4,11 +4,7 @@
 ZSH_THEME_PROMPT_PREFIX_SPACING=" "
 ZSH_THEME_PROMPT_SUFFIX_SPACING=" "
 
-enable_emoji=1
-
-[[ "$TERM_PROGRAM" = "Hyper" ]] && unset enable_emoji
-
-if [[ -n "$enable_emoji" ]] && axzsh_is_utf_terminal; then
+if axzsh_is_utf_terminal; then
        # UTF8 capable terminal:
        if [[ -r "$HOME/.system_emoji-$SHORT_HOST" ]]; then
                system_emoji=$(<"$HOME/.system_emoji-$SHORT_HOST")
@@ -17,23 +13,33 @@ if [[ -n "$enable_emoji" ]] && axzsh_is_utf_terminal; then
        else
                system_emoji="🍀"
        fi
-       [[ -n "$VTE_VERSION" ]] \
+       axzsh_is_widechar_terminal \
                && emoji_spacing="" \
                || emoji_spacing=" "
 
        ZSH_THEME_VCS_PROMPT_CLEAN="👌$emoji_spacing"
        ZSH_THEME_VCS_PROMPT_DIRTY="👻$emoji_spacing"
 
-       # Prompt on right side
-       RPS1="%(?..%{$fg_no_bold[red]%}❌$emoji_spacing%? ↵%{$reset_color%})"
+       # Primary prompt on the right-hand side.
+       RPS1="%(?..%{$fg_no_bold[red]%}🤔$emoji_spacing %?↵%{$reset_color%})"
 else
        # Non-UTF8 or incompatible terminal
        system_emoji=">"
        emoji_spacing=""
 
+       # Primary prompt on the right-hand side.
        RPS1="%(?..%{$fg_no_bold[red]%}<%?>%{$reset_color%})"
 fi
 
-PS1="${system_emoji}${emoji_spacing} $(ax_logname_prompt_yn)$(ax_hostname_prompt_yn)%B%2~%b"'$(ax_vcs_prompt)'"$(ax_prompt)"
+axzsh_logname_prompt_functions=($axzsh_logname_prompt_functions axzsh_logname_prompt_root)
+axzsh_hostname_prompt_functions=($axzsh_hostname_prompt_functions axzsh_hostname_prompt_root)
+
+# The primary prompt string, printed before a command is read.
+PS1="${system_emoji}${emoji_spacing} $(axzsh_logname_prompt_yn)$(axzsh_hostname_prompt_yn)%B%2~%b"'$(axzsh_vcs_prompt)'"$(axzsh_prompt)"
+
+# Default execution trace prompt.
+PS4="$fg_no_bold[yellow]->$reset_color "
+# This prompt is compatible with sh(1) and bash(1), too, so export it!
+export PS4
 
-unset enable_emoji system_emoji emoji_spacing
+unset system_emoji emoji_spacing