From f996d2d6ed3aa82f697f8b96afd57eb3b0593875 Mon Sep 17 00:00:00 2001 From: Hal Gentz Date: Thu, 28 Sep 2017 22:07:37 -0600 Subject: [PATCH 1/4] Fixes issue #619 Signed-off-by: Hal Gentz --- powerlevel9k.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 7e7b4e11..e3ebf59f 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -570,7 +570,7 @@ prompt_context() { local content="" - if [[ "$POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then + if [[ "$POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$(whoami)" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then if [[ $(print -P "%#") == '#' ]]; then current_state="ROOT" From ec47f1b583d5e40e299f9b4b065fe1626240e5e5 Mon Sep 17 00:00:00 2001 From: Hal Gentz Date: Thu, 28 Sep 2017 22:20:58 -0600 Subject: [PATCH 2/4] These probably have similar bugs Signed-off-by: Hal Gentz --- powerlevel9k.zsh-theme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index e3ebf59f..97d13a3c 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -579,7 +579,7 @@ prompt_context() { content="${POWERLEVEL9K_CONTEXT_TEMPLATE}" elif [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]]; then - content="$USER" + content="$(whoami)" else return fi @@ -594,7 +594,7 @@ set_default POWERLEVEL9K_USER_TEMPLATE "%n" prompt_user() { local current_state="DEFAULT" typeset -AH user_state - if [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]]; then + if [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]] || [[ "$(whoami)" != "$DEFAULT_USER" ]]; then if [[ $(print -P "%#") == '#' ]]; then user_state=( "STATE" "ROOT" @@ -606,7 +606,7 @@ prompt_user() { else user_state=( "STATE" "DEFAULT" - "CONTENT" "$USER" + "CONTENT" "$(whoami)" "BACKGROUND_COLOR" "${DEFAULT_COLOR}" "FOREGROUND_COLOR" "011" "VISUAL_IDENTIFIER" "USER_ICON" From 36b833aae391000ec752188fae4cc67a314a7756 Mon Sep 17 00:00:00 2001 From: Simon Pettersson Date: Thu, 5 Oct 2017 21:57:08 +0200 Subject: [PATCH 3/4] Corrected awesome-fontconfig lock icon --- functions/icons.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/icons.zsh b/functions/icons.zsh index 3a4909f7..89fc0cd5 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -153,7 +153,7 @@ case $POWERLEVEL9K_MODE in SWIFT_ICON '' GO_ICON '' PUBLIC_IP_ICON '' - LOCK_ICON $'\UE138' #  + LOCK_ICON $'\UF023' #  EXECUTION_TIME_ICON $'\uF253' SSH_ICON '(ssh)' VPN_ICON $'\uF023' From 01b554cda8dab4d8854d93f41420a050917a3753 Mon Sep 17 00:00:00 2001 From: Ben Hilburn Date: Fri, 6 Oct 2017 21:43:25 -0400 Subject: [PATCH 4/4] Adding a space after VCS_BRANCH_ICON by default --- functions/icons.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/icons.zsh b/functions/icons.zsh index 89fc0cd5..7124386b 100644 --- a/functions/icons.zsh +++ b/functions/icons.zsh @@ -69,7 +69,7 @@ case $POWERLEVEL9K_MODE in VCS_TAG_ICON $'\uE817 ' #  VCS_BOOKMARK_ICON $'\uE87B' #  VCS_COMMIT_ICON $'\uE821 ' #  - VCS_BRANCH_ICON $'\uE220' #  + VCS_BRANCH_ICON $'\uE220 ' #  VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_GIT_ICON $'\uE20E ' #  VCS_GIT_GITHUB_ICON $'\uE20E ' # @@ -140,7 +140,7 @@ case $POWERLEVEL9K_MODE in VCS_TAG_ICON $'\uF217 ' #  VCS_BOOKMARK_ICON $'\uF27B' #  VCS_COMMIT_ICON $'\uF221 ' #  - VCS_BRANCH_ICON $'\uF126' #  + VCS_BRANCH_ICON $'\uF126 ' #  VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_GIT_ICON $'\uF1D3 ' #  VCS_GIT_GITHUB_ICON $'\uF113 ' #  @@ -282,7 +282,7 @@ case $POWERLEVEL9K_MODE in VCS_TAG_ICON '' VCS_BOOKMARK_ICON $'\u263F' # ☿ VCS_COMMIT_ICON '' - VCS_BRANCH_ICON $'\uE0A0' #  + VCS_BRANCH_ICON $'\uE0A0 ' #  VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_GIT_ICON '' VCS_GIT_GITHUB_ICON ''