From 0993e7ce88f90367b543d4bf324023a352304fe8 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sun, 7 Jun 2015 03:08:24 +0200 Subject: [PATCH 01/10] New prompt segment `os_icon`. --- powerlevel9k.zsh-theme | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index df0319c7..699a8195 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -43,6 +43,16 @@ # POWERLEVEL9K_COLOR_SCHEME='light' ################################################################ +# OS detection, default to Linux +case $(uname) in + 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 # when building the left-hand prompt. Because the RPROMPT is created from # right-left but reads the opposite, this isn't necessary for the other side. @@ -347,6 +357,19 @@ prompt_longstatus() { [[ -n "$symbols" ]] && $1_prompt_segment $0 $bg $DEFAULT_COLOR "$symbols" } +# print a little OS icon +prompt_os_icon() { + if [[ "$OS" == "Darwin" ]]; then + LOGO="\uF8FF" # ๏ฃฟ + elif [[ "$OS" == 'Linux' ]]; then + LOGO="\u1F427" # ๐Ÿง + elif [[ "$OS" == 'FreeBSD' ]]; then + LOGO="\u1F608" # ๐Ÿ˜ˆ + fi + + $1_prompt_segment $0 008 241 $LOGO +} + # rbenv information prompt_rbenv() { if [[ -n "$RBENV_VERSION" ]]; then From 84dfa02a89157896392be8d226153c7c0630ebe2 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sat, 25 Jul 2015 00:02:32 +0200 Subject: [PATCH 02/10] Updated the os-icon prompt to newest coding guidelines. --- powerlevel9k.zsh-theme | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index d48b40b6..55fbb017 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -510,14 +510,14 @@ prompt_node_version() { # print a little OS icon prompt_os_icon() { if [[ "$OS" == "Darwin" ]]; then - LOGO="\uF8FF" # ๏ฃฟ + LOGO=$'\uF8FF' # ๏ฃฟ elif [[ "$OS" == 'Linux' ]]; then - LOGO="\u1F427" # ๐Ÿง + LOGO=$'\u1F427' # ๐Ÿง elif [[ "$OS" == 'FreeBSD' ]]; then - LOGO="\u1F608" # ๐Ÿ˜ˆ + LOGO=$'\u1F608' # ๐Ÿ˜ˆ fi - $1_prompt_segment $0 008 241 $LOGO + $1_prompt_segment "$0" "008" "241" "$LOGO" } # rbenv information From 2b00d09bfbae37641cc3d93d3f055eea273ca8c0 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sat, 25 Jul 2015 00:04:45 +0200 Subject: [PATCH 03/10] Added documentation. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 71dfceb2..662a6cc3 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ currently available are: * **dir** - Your current working directory. * **history** - The command number for the current line. * **node_version** - Show the version number of the installed Node.js. +* **os_icon** - Display a nice little icon, depending on your operating system. * **rbenv** - Ruby environment information (if one is active). * **rspec_stats** - Show a ratio of test classes vs code classes for RSpec. * **status** - The return code of the previous command, and status of background jobs. From c116ead6aacb9c4c66529982ee420fa1bd6e8958 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Mon, 27 Jul 2015 00:20:40 +0200 Subject: [PATCH 04/10] Determine the right OS-Icon only once. --- powerlevel9k.zsh-theme | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index d7c2346a..5b8c4596 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -46,12 +46,30 @@ # OS detection, default to Linux case $(uname) in - FreeBSD) OS=FreeBSD ;; - DragonFly) OS=FreeBSD ;; - OpenBSD) OS=OpenBSD ;; - Darwin) OS=Darwin ;; - SunOS) OS=SunOS ;; - *) OS=Linux ;; + 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' # ๐Ÿง + ;; esac # The `CURRENT_BG` variable is used to remember what the last BG color used was @@ -509,15 +527,7 @@ prompt_node_version() { # print a little OS icon prompt_os_icon() { - if [[ "$OS" == "Darwin" ]]; then - LOGO=$'\uF8FF' # ๏ฃฟ - elif [[ "$OS" == 'Linux' ]]; then - LOGO=$'\u1F427' # ๐Ÿง - elif [[ "$OS" == 'FreeBSD' ]]; then - LOGO=$'\u1F608' # ๐Ÿ˜ˆ - fi - - $1_prompt_segment "$0" "008" "241" "$LOGO" + $1_prompt_segment "$0" "008" "241" "$OS_ICON" } # rbenv information From 504a64996b3da9ada36615b51026ba7033b3a47e Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Mon, 27 Jul 2015 00:35:39 +0200 Subject: [PATCH 05/10] Uhm. It seems to make a difference, whether you print unicode characters with lowercase \u or uppercase \U. Some of them only work with uppercase \U. Therefore I changed all of them to the uppercase variant. Try `echo $'\u1F427' $'\U1F427'`. Only the latter one should work. The first one prints some gibberish. --- powerlevel9k.zsh-theme | 168 ++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 5b8c4596..60e115e9 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -48,27 +48,27 @@ case $(uname) in FreeBSD) OS=FreeBSD - OS_ICON=$'\u1F608' # ๐Ÿ˜ˆ + OS_ICON=$'\U1F608' # ๐Ÿ˜ˆ ;; DragonFly) OS=FreeBSD - OS_ICON=$'\u1F608' # ๐Ÿ˜ˆ + OS_ICON=$'\U1F608' # ๐Ÿ˜ˆ ;; OpenBSD) OS=OpenBSD - OS_ICON=$'\u1F608' # ๐Ÿ˜ˆ + OS_ICON=$'\U1F608' # ๐Ÿ˜ˆ ;; Darwin) OS=Darwin - OS_ICON=$'\uF8FF' # ๏ฃฟ + OS_ICON=$'\UF8FF' # ๏ฃฟ ;; SunOS) OS=SunOS - OS_ICON=$'\u1F31E' # ๐ŸŒž + OS_ICON=$'\U1F31E' # ๐ŸŒž ;; *) OS=Linux - OS_ICON=$'\u1F427' # ๐Ÿง + OS_ICON=$'\U1F427' # ๐Ÿง ;; esac @@ -87,112 +87,112 @@ case $POWERLEVEL9K_MODE in # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched LEFT_SEGMENT_SEPARATOR='' RIGHT_SEGMENT_SEPARATOR='' - ROOT_ICON="\uE801" # ๎  - RUBY_ICON="\uE847" # ๎ก‡ - AWS_ICON="\uE895" # ๎ข• - BACKGROUND_JOBS_ICON="\uE82F " # ๎ ฏ - TEST_ICON="\uE891" # ๎ข‘ - OK_ICON="\u2713" # โœ“ - FAIL_ICON="\u2718" # โœ˜ + ROOT_ICON="\UE801" # ๎  + RUBY_ICON="\UE847" # ๎ก‡ + AWS_ICON="\UE895" # ๎ข• + BACKGROUND_JOBS_ICON="\UE82F " # ๎ ฏ + TEST_ICON="\UE891" # ๎ข‘ + OK_ICON="\U2713" # โœ“ + FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" - VCS_UNTRACKED_ICON="\uE16C" # ๎…ฌ - VCS_UNSTAGED_ICON="\uE17C" # ๎…ผ - VCS_STAGED_ICON="\uE168" # ๎…จ - VCS_STASH_ICON="\uE133 " # ๎„ณ - #VCS_INCOMING_CHANGES="\uE1EB " # ๎‡ซ - #VCS_INCOMING_CHANGES="\uE80D " # ๎  - VCS_INCOMING_CHANGES="\uE131 " # ๎„ฑ - #VCS_OUTGOING_CHANGES="\uE1EC " # ๎‡ฌ - #VCS_OUTGOING_CHANGES="\uE80E " # ๎ Ž - VCS_OUTGOING_CHANGES="\uE132 " # ๎„ฒ - VCS_TAG_ICON="\uE817 " # ๎ — - VCS_BOOKMARK_ICON="\uE87B" # ๎กป - VCS_COMMIT_ICON="\uE821 " # ๎ ก - VCS_BRANCH_ICON="\uE220" # ๎ˆ  - VCS_REMOTE_BRANCH_ICON=" \uE804 " # ๎ „ - VCS_GIT_ICON="\uE20E " # ๎ˆŽ - VCS_HG_ICON="\uE1C3 " # ๎‡ƒ + VCS_UNTRACKED_ICON="\UE16C" # ๎…ฌ + VCS_UNSTAGED_ICON="\UE17C" # ๎…ผ + VCS_STAGED_ICON="\UE168" # ๎…จ + VCS_STASH_ICON="\UE133 " # ๎„ณ + #VCS_INCOMING_CHANGES="\UE1EB " # ๎‡ซ + #VCS_INCOMING_CHANGES="\UE80D " # ๎  + VCS_INCOMING_CHANGES="\UE131 " # ๎„ฑ + #VCS_OUTGOING_CHANGES="\UE1EC " # ๎‡ฌ + #VCS_OUTGOING_CHANGES="\UE80E " # ๎ Ž + VCS_OUTGOING_CHANGES="\UE132 " # ๎„ฒ + VCS_TAG_ICON="\UE817 " # ๎ — + VCS_BOOKMARK_ICON="\UE87B" # ๎กป + VCS_COMMIT_ICON="\UE821 " # ๎ ก + VCS_BRANCH_ICON="\UE220" # ๎ˆ  + VCS_REMOTE_BRANCH_ICON=" \UE804 " # ๎ „ + VCS_GIT_ICON="\UE20E " # ๎ˆŽ + VCS_HG_ICON="\UE1C3 " # ๎‡ƒ ;; 'compatible') - LEFT_SEGMENT_SEPARATOR="\u2B80" # โฎ€ - RIGHT_SEGMENT_SEPARATOR="\u2B82" # โฎ‚ - ROOT_ICON="\u26A1" # โšก + LEFT_SEGMENT_SEPARATOR="\U2B80" # โฎ€ + RIGHT_SEGMENT_SEPARATOR="\U2B82" # โฎ‚ + ROOT_ICON="\U26A1" # โšก RUBY_ICON='' AWS_ICON="AWS:" - BACKGROUND_JOBS_ICON="\u2699" # โš™ + BACKGROUND_JOBS_ICON="\U2699" # โš™ TEST_ICON='' - OK_ICON="\u2713" # โœ“ - FAIL_ICON="\u2718" # โœ˜ + OK_ICON="\U2713" # โœ“ + FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" VCS_UNTRACKED_ICON='?' - VCS_UNSTAGED_ICON="\u25CF" # โ— - VCS_STAGED_ICON="\u271A" # โœš - VCS_STASH_ICON="\u235F" # โŸ - VCS_INCOMING_CHANGES="\u2193" # โ†“ - VCS_OUTGOING_CHANGES="\u2191" # โ†‘ + VCS_UNSTAGED_ICON="\U25CF" # โ— + VCS_STAGED_ICON="\U271A" # โœš + VCS_STASH_ICON="\U235F" # โŸ + VCS_INCOMING_CHANGES="\U2193" # โ†“ + VCS_OUTGOING_CHANGES="\U2191" # โ†‘ VCS_TAG_ICON='' - VCS_BOOKMARK_ICON="\u263F" # โ˜ฟ + VCS_BOOKMARK_ICON="\U263F" # โ˜ฟ VCS_COMMIT_ICON='' VCS_BRANCH_ICON='@' - VCS_REMOTE_BRANCH_ICON="\u2192" # โ†’ + VCS_REMOTE_BRANCH_ICON="\U2192" # โ†’ VCS_GIT_ICON='Git' VCS_HG_ICON='HG' ;; 'awesome-patched') # Awesome-Patched Font required! # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched - LEFT_SEGMENT_SEPARATOR="\uE0B0" # ๎‚ฐ - RIGHT_SEGMENT_SEPARATOR="\uE0B2" # ๎‚ฒ - ROOT_ICON="\u26A1" # โšก - RUBY_ICON="\uE847" # ๎ก‡ - AWS_ICON="\uE895" # ๎ข• - BACKGROUND_JOBS_ICON="\uE82F " # ๎ ฏ - TEST_ICON="\uE891" # ๎ข‘ - OK_ICON="\u2713" # โœ“ - FAIL_ICON="\u2718" # โœ˜ + LEFT_SEGMENT_SEPARATOR="\UE0B0" # ๎‚ฐ + RIGHT_SEGMENT_SEPARATOR="\UE0B2" # ๎‚ฒ + ROOT_ICON="\U26A1" # โšก + RUBY_ICON="\UE847" # ๎ก‡ + AWS_ICON="\UE895" # ๎ข• + BACKGROUND_JOBS_ICON="\UE82F " # ๎ ฏ + TEST_ICON="\UE891" # ๎ข‘ + OK_ICON="\U2713" # โœ“ + FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" - VCS_UNTRACKED_ICON="\uE16C" # ๎…ฌ - VCS_UNSTAGED_ICON="\uE17C" # ๎…ผ - VCS_STAGED_ICON="\uE168" # ๎…จ - VCS_STASH_ICON="\uE133 " # ๎„ณ - #VCS_INCOMING_CHANGES="\uE1EB " # ๎‡ซ - #VCS_INCOMING_CHANGES="\uE80D " # ๎  - VCS_INCOMING_CHANGES="\uE131 " # ๎„ฑ - #VCS_OUTGOING_CHANGES="\uE1EC " # ๎‡ฌ - #VCS_OUTGOING_CHANGES="\uE80E " # ๎ Ž - VCS_OUTGOING_CHANGES="\uE132 " # ๎„ฒ - VCS_TAG_ICON="\uE817 " # ๎ — - VCS_BOOKMARK_ICON="\uE87B" # ๎กป - VCS_COMMIT_ICON="\uE821 " # ๎ ก - VCS_BRANCH_ICON="\uE220" # ๎ˆ  - VCS_REMOTE_BRANCH_ICON=" \uE804 " # ๎ „ - VCS_GIT_ICON="\uE20E " # ๎ˆŽ - VCS_HG_ICON="\uE1C3 " # ๎‡ƒ + VCS_UNTRACKED_ICON="\UE16C" # ๎…ฌ + VCS_UNSTAGED_ICON="\UE17C" # ๎…ผ + VCS_STAGED_ICON="\UE168" # ๎…จ + VCS_STASH_ICON="\UE133 " # ๎„ณ + #VCS_INCOMING_CHANGES="\UE1EB " # ๎‡ซ + #VCS_INCOMING_CHANGES="\UE80D " # ๎  + VCS_INCOMING_CHANGES="\UE131 " # ๎„ฑ + #VCS_OUTGOING_CHANGES="\UE1EC " # ๎‡ฌ + #VCS_OUTGOING_CHANGES="\UE80E " # ๎ Ž + VCS_OUTGOING_CHANGES="\UE132 " # ๎„ฒ + VCS_TAG_ICON="\UE817 " # ๎ — + VCS_BOOKMARK_ICON="\UE87B" # ๎กป + VCS_COMMIT_ICON="\UE821 " # ๎ ก + VCS_BRANCH_ICON="\UE220" # ๎ˆ  + VCS_REMOTE_BRANCH_ICON=" \UE804 " # ๎ „ + VCS_GIT_ICON="\UE20E " # ๎ˆŽ + VCS_HG_ICON="\UE1C3 " # ๎‡ƒ ;; *) # Powerline-Patched Font required! # See https://github.com/Lokaltog/powerline-fonts - LEFT_SEGMENT_SEPARATOR="\uE0B0" # ๎‚ฐ - RIGHT_SEGMENT_SEPARATOR="\uE0B2" # ๎‚ฒ - ROOT_ICON="\u26A1" # โšก + LEFT_SEGMENT_SEPARATOR="\UE0B0" # ๎‚ฐ + RIGHT_SEGMENT_SEPARATOR="\UE0B2" # ๎‚ฒ + ROOT_ICON="\U26A1" # โšก RUBY_ICON='' AWS_ICON="AWS:" - BACKGROUND_JOBS_ICON="\u2699" # โš™ + BACKGROUND_JOBS_ICON="\U2699" # โš™ TEST_ICON='' - OK_ICON="\u2713" # โœ“ - FAIL_ICON="\u2718" # โœ˜ + OK_ICON="\U2713" # โœ“ + FAIL_ICON="\U2718" # โœ˜ SYMFONY_ICON="SF" VCS_UNTRACKED_ICON='?' - VCS_UNSTAGED_ICON="\u25CF" # โ— - VCS_STAGED_ICON="\u271A" # โœš - VCS_STASH_ICON="\u235F" # โŸ - VCS_INCOMING_CHANGES="\u2193" # โ†“ - VCS_OUTGOING_CHANGES="\u2191" # โ†‘ + VCS_UNSTAGED_ICON="\U25CF" # โ— + VCS_STAGED_ICON="\U271A" # โœš + VCS_STASH_ICON="\U235F" # โŸ + VCS_INCOMING_CHANGES="\U2193" # โ†“ + VCS_OUTGOING_CHANGES="\U2191" # โ†‘ VCS_TAG_ICON='' - VCS_BOOKMARK_ICON="\u263F" # โ˜ฟ + VCS_BOOKMARK_ICON="\U263F" # โ˜ฟ VCS_COMMIT_ICON='' - VCS_BRANCH_ICON="\uE0A0 " # ๎‚  - VCS_REMOTE_BRANCH_ICON="\u2192" # โ†’ + VCS_BRANCH_ICON="\UE0A0 " # ๎‚  + VCS_REMOTE_BRANCH_ICON="\U2192" # โ†’ VCS_GIT_ICON="" VCS_HG_ICON="" ;; @@ -520,7 +520,7 @@ prompt_longstatus() { prompt_node_version() { local nvm_prompt=$(node -v 2>/dev/null) [[ -z "${nvm_prompt}" ]] && return - NODE_ICON=$'\u2B22' # โฌข + NODE_ICON=$'\U2B22' # โฌข $1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON" } From 850702b1151f050211070faaceddfd7a37aa3fc5 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Tue, 28 Jul 2015 11:09:55 +0200 Subject: [PATCH 06/10] 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 07/10] 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 08/10] 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" From 4ef5294d0b082e46526c2290187b0ee8667e4f4c Mon Sep 17 00:00:00 2001 From: Ben Hilburn Date: Tue, 28 Jul 2015 19:56:46 -0700 Subject: [PATCH 09/10] os_icon: Combining OS detection and icon setting into one case statement --- powerlevel9k.zsh-theme | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 9962744f..8e442328 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -44,16 +44,6 @@ #zstyle ':vcs_info:*+*:*' debug true #set -o xtrace -# OS detection, default to Linux -case $(uname) in - 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 # when building the left-hand prompt. Because the RPROMPT is created from # right-left but reads the opposite, this isn't necessary for the other side. @@ -196,6 +186,15 @@ case $POWERLEVEL9K_MODE in ;; esac +# OS detection for the `os_icon` segment +case $(uname) in + Darwin) OS_ICON=$APPLE_ICON ;; + FreeBSD) OS_ICON=$FREEBSD_ICON ;; + Linux) OS_ICON=$LINUX_ICON ;; + SunOS) OS_ICON=$SUNOS_ICON ;; + *) OS_ICON='' ;; +esac + if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then VCS_BRANCH_ICON='' fi @@ -525,14 +524,7 @@ 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" + $1_prompt_segment "$0" "008" "255" "$OS_ICON" } # rbenv information From 1edc606665580733e841ba90dae508ae9221c3b9 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Wed, 29 Jul 2015 10:30:58 +0200 Subject: [PATCH 10/10] Added OpenBSD and DragonFly again. --- powerlevel9k.zsh-theme | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 8e442328..9a71278a 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -188,11 +188,13 @@ esac # OS detection for the `os_icon` segment case $(uname) in - Darwin) OS_ICON=$APPLE_ICON ;; - FreeBSD) OS_ICON=$FREEBSD_ICON ;; - Linux) OS_ICON=$LINUX_ICON ;; - SunOS) OS_ICON=$SUNOS_ICON ;; - *) OS_ICON='' ;; + Darwin) OS_ICON=$APPLE_ICON ;; + FreeBSD) OS_ICON=$FREEBSD_ICON ;; + OpenBSD) OS_ICON=$FREEBSD_ICON ;; + DragonFly) OS_ICON=$FREEBSD_ICON ;; + Linux) OS_ICON=$LINUX_ICON ;; + SunOS) OS_ICON=$SUNOS_ICON ;; + *) OS_ICON='' ;; esac if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then