From e8dc33bb07780dcd5d3c8150196093b307622d25 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sat, 25 Jul 2015 11:22:24 +0200 Subject: [PATCH 1/5] Added possibility to disable the RPROMPT completly. --- powerlevel9k.zsh-theme | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 69eee6e3..715c24f6 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -644,7 +644,10 @@ $POWERLEVEL9K_MULTILINE_SECOND_PROMPT_PREFIX" RPROMPT_PREFIX='' RPROMPT_SUFFIX='' fi - RPROMPT=$RPROMPT_PREFIX"%{%f%b%k%}"'$(build_right_prompt)'"%{$reset_color%}"$RPROMPT_SUFFIX + + if [[ "$POWERLEVEL9K_DISABLE_RPROMPT" != true ]]; then + RPROMPT=$RPROMPT_PREFIX"%{%f%b%k%}"'$(build_right_prompt)'"%{$reset_color%}"$RPROMPT_SUFFIX + fi } From 188970f11e5d9b37962bd97a8fd54386979bc38b Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sat, 25 Jul 2015 11:22:51 +0200 Subject: [PATCH 2/5] Added documentation for disable RPROMPT. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 71dfceb2..1cf3ff71 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ this theme focus on three primary goals: - [Symbols](#symbols) - [Styling](#styling) - [Double-Lined Prompt](#double-lined-prompt) + - [Disable Right Prompt](#disable-right-prompt) - [Light Color Theme](#light-color-theme) - [Segment Color Customization](#segment-color-customization) - [Special Segment Colors](#special-segment-colors) @@ -352,6 +353,12 @@ following variables in your `~/.zshrc`: POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="โ†ฑ" POWERLEVEL9K_MULTILINE_SECOND_PROMPT_PREFIX="โ†ณ " +#### Disable Right Prompt + +If you do not want a right prompt, you can disable it by setting: + + POWERLEVEL9K_DISABLE_RPROMPT=true + #### Light Color Theme If you prefer to use "light" colors, simply set `POWERLEVEL9K_COLOR_SCHEME` From 850702b1151f050211070faaceddfd7a37aa3fc5 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Tue, 28 Jul 2015 11:09:55 +0200 Subject: [PATCH 3/5] Reworked OS-Icons to fit in our general scheme. --- powerlevel9k.zsh-theme | 53 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 1ec3e0d4..3df3b006 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -46,30 +46,12 @@ # OS detection, default to Linux case $(uname) in - FreeBSD) - OS=FreeBSD - OS_ICON=$'\U1F608' # ๐Ÿ˜ˆ - ;; - DragonFly) - OS=FreeBSD - OS_ICON=$'\U1F608' # ๐Ÿ˜ˆ - ;; - OpenBSD) - OS=OpenBSD - OS_ICON=$'\U1F608' # ๐Ÿ˜ˆ - ;; - Darwin) - OS=Darwin - OS_ICON=$'\UF8FF' # ๏ฃฟ - ;; - SunOS) - OS=SunOS - OS_ICON=$'\U1F31E' # ๐ŸŒž - ;; - *) - OS=Linux - OS_ICON=$'\U1F427' # ๐Ÿง - ;; + FreeBSD) OS=FreeBSD ;; + DragonFly) OS=FreeBSD ;; + OpenBSD) OS=OpenBSD ;; + Darwin) OS=Darwin ;; + SunOS) OS=SunOS ;; + *) OS=Linux ;; esac # The `CURRENT_BG` variable is used to remember what the last BG color used was @@ -95,6 +77,10 @@ case $POWERLEVEL9K_MODE in OK_ICON="\U2713" # โœ“ FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" + APPLE_ICON=$'\UF8FF' # ๏ฃฟ + FREEBSD_ICON=$'\U1F608 ' # ๐Ÿ˜ˆ + LINUX_ICON=$'\U1F427 ' # ๐Ÿง + SUNOS_ICON=$'\U1F31E ' # ๐ŸŒž VCS_UNTRACKED_ICON="\UE16C" # ๎…ฌ VCS_UNSTAGED_ICON="\UE17C" # ๎…ผ VCS_STAGED_ICON="\UE168" # ๎…จ @@ -124,6 +110,10 @@ case $POWERLEVEL9K_MODE in OK_ICON="\U2713" # โœ“ FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" + APPLE_ICON='OSX' + FREEBSD_ICON='BSD' + LINUX_ICON='Lx' + SUNOS_ICON='Sun' VCS_UNTRACKED_ICON='?' VCS_UNSTAGED_ICON="\U25CF" # โ— VCS_STAGED_ICON="\U271A" # โœš @@ -151,6 +141,10 @@ case $POWERLEVEL9K_MODE in OK_ICON="\U2713" # โœ“ FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" + APPLE_ICON=$'\UF8FF' # ๏ฃฟ + FREEBSD_ICON=$'\U1F608 ' # ๐Ÿ˜ˆ + LINUX_ICON=$'\U1F427 ' # ๐Ÿง + SUNOS_ICON=$'\U1F31E ' # ๐ŸŒž VCS_UNTRACKED_ICON="\UE16C" # ๎…ฌ VCS_UNSTAGED_ICON="\UE17C" # ๎…ผ VCS_STAGED_ICON="\UE168" # ๎…จ @@ -182,6 +176,10 @@ case $POWERLEVEL9K_MODE in OK_ICON="\U2713" # โœ“ FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" + APPLE_ICON='OSX' + FREEBSD_ICON='BSD' + LINUX_ICON='Lx' + SUNOS_ICON='Sun' VCS_UNTRACKED_ICON='?' VCS_UNSTAGED_ICON="\U25CF" # โ— VCS_STAGED_ICON="\U271A" # โœš @@ -527,6 +525,13 @@ prompt_node_version() { # print a little OS icon prompt_os_icon() { + case "$OS" in + "Darwin") OS_ICON=$APPLE_ICON ;; + "FreeBSD") OS_ICON=$FREEBSD_ICON ;; + "Linux") OS_ICON=$LINUX_ICON ;; + "SunOS") OS_ICON=$SUNOS_ICON ;; + *) OS_ICON='' ;; + esac $1_prompt_segment "$0" "008" "241" "$OS_ICON" } From e025a6cdd47249d6e3d30e895198acf08472a0e4 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Tue, 28 Jul 2015 11:14:46 +0200 Subject: [PATCH 4/5] The VCS-Branch icon is broken, if we use Unicode-characters with uppercase \U. --- powerlevel9k.zsh-theme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 3df3b006..47ca14ce 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -94,7 +94,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=" \UE804 " # ๎ „ VCS_GIT_ICON="\UE20E " # ๎ˆŽ VCS_HG_ICON="\UE1C3 " # ๎‡ƒ @@ -158,7 +158,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=" \UE804 " # ๎ „ VCS_GIT_ICON="\UE20E " # ๎ˆŽ VCS_HG_ICON="\UE1C3 " # ๎‡ƒ From 8a6b9fe09db484265da010b5ae82ea6a5ca0a984 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Tue, 28 Jul 2015 19:50:53 +0200 Subject: [PATCH 5/5] Whitespace fix. --- powerlevel9k.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 47ca14ce..9962744f 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -529,7 +529,7 @@ prompt_os_icon() { "Darwin") OS_ICON=$APPLE_ICON ;; "FreeBSD") OS_ICON=$FREEBSD_ICON ;; "Linux") OS_ICON=$LINUX_ICON ;; - "SunOS") OS_ICON=$SUNOS_ICON ;; + "SunOS") OS_ICON=$SUNOS_ICON ;; *) OS_ICON='' ;; esac $1_prompt_segment "$0" "008" "241" "$OS_ICON"