Merge branch 'dritter/os_detection' into dritter-os-icon

This commit is contained in:
Ben Hilburn 2015-07-26 16:30:04 -07:00
commit 0dc7c5bf38
2 changed files with 127 additions and 101 deletions

View file

@ -50,6 +50,7 @@ this theme focus on three primary goals:
- [Special Segment Colors](#special-segment-colors) - [Special Segment Colors](#special-segment-colors)
- [Troubleshooting](#troubleshooting) - [Troubleshooting](#troubleshooting)
- [Gaps Between Segments](#gaps-between-segments) - [Gaps Between Segments](#gaps-between-segments)
- [Segment Colors are Wrong](#segment-colors-are-wrong)
- [Meta](#meta) - [Meta](#meta)
- [Kudos](#kudos) - [Kudos](#kudos)
- [Developing](#developing) - [Developing](#developing)
@ -276,11 +277,18 @@ to a certain length:
#### The 'time' segment #### The 'time' segment
By default the time is show in 'H:M:S' format. If you want to change it, By default the time is show in 'H:M:S' format. If you want to change it,
just set another format in your `~/.zshrc`: just set another format in your `~/.zshrc`. As an example, this is a reversed
time format:
# Reversed time format # Reversed time format
POWERLEVEL9K_TIME_FORMAT='%D{%S:%M:%H}' POWERLEVEL9K_TIME_FORMAT='%D{%S:%M:%H}'
If you are using an "Awesome Powerline Font", you can add a time symbol to this
segment, as well:
# Output time, date, and a symbol from the "Awesome Powerline Font" set
POWERLEVEL9K_TIME_FORMAT="%D{%H:%M:%S \uE868 %d.%m.%y}"
#### Unit Test Ratios #### Unit Test Ratios
The `symfony2_tests` and `rspec_tests` segments both show a ratio of "real" The `symfony2_tests` and `rspec_tests` segments both show a ratio of "real"
@ -436,6 +444,15 @@ Thankfully, this is easy to fix. This happens if you have successfully installed
Powerline fonts, but did not make a Powerline font the default font in your Powerline fonts, but did not make a Powerline font the default font in your
terminal emulator (e.g., 'terminator', 'gnome-terminal', 'konsole', etc.,). terminal emulator (e.g., 'terminator', 'gnome-terminal', 'konsole', etc.,).
#### Segment Colors are Wrong
If the color display within your terminal seems off, it's possible you are using
a reduced color set. You can check this by invoking `echotc Co` in your
terminal, which should yield `256`. If you see something different, try setting
`xterm-256color` in your `~/.zshrc`:
TERM=xterm-256color
### Meta ### Meta
#### Kudos #### Kudos

View file

@ -46,12 +46,30 @@
# OS detection, default to Linux # OS detection, default to Linux
case $(uname) in case $(uname) in
FreeBSD) OS=FreeBSD ;; FreeBSD)
DragonFly) OS=FreeBSD ;; OS=FreeBSD
OpenBSD) OS=OpenBSD ;; OS_ICON=$'\U1F608' # 😈
Darwin) OS=Darwin ;; ;;
SunOS) OS=SunOS ;; DragonFly)
*) OS=Linux ;; 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 esac
# The `CURRENT_BG` variable is used to remember what the last BG color used was # The `CURRENT_BG` variable is used to remember what the last BG color used was
@ -69,112 +87,112 @@ case $POWERLEVEL9K_MODE in
# See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
LEFT_SEGMENT_SEPARATOR='' LEFT_SEGMENT_SEPARATOR=''
RIGHT_SEGMENT_SEPARATOR='' RIGHT_SEGMENT_SEPARATOR=''
ROOT_ICON="\uE801" #  ROOT_ICON="\UE801" # 
RUBY_ICON="\uE847" #  RUBY_ICON="\UE847" # 
AWS_ICON="\uE895" #  AWS_ICON="\UE895" # 
BACKGROUND_JOBS_ICON="\uE82F " #  BACKGROUND_JOBS_ICON="\UE82F " # 
TEST_ICON="\uE891" #  TEST_ICON="\UE891" # 
OK_ICON="\u2713" # ✓ OK_ICON="\U2713" # ✓
FAIL_ICON="\u2718" # ✘ FAIL_ICON="\U2718" # ✘
SYMFONY_ICON="SF" SYMFONY_ICON="SF"
VCS_UNTRACKED_ICON="\uE16C" #  VCS_UNTRACKED_ICON="\UE16C" # 
VCS_UNSTAGED_ICON="\uE17C" #  VCS_UNSTAGED_ICON="\UE17C" # 
VCS_STAGED_ICON="\uE168" #  VCS_STAGED_ICON="\UE168" # 
VCS_STASH_ICON="\uE133 " #  VCS_STASH_ICON="\UE133 " # 
#VCS_INCOMING_CHANGES="\uE1EB " #  #VCS_INCOMING_CHANGES="\UE1EB " # 
#VCS_INCOMING_CHANGES="\uE80D " #  #VCS_INCOMING_CHANGES="\UE80D " # 
VCS_INCOMING_CHANGES="\uE131 " #  VCS_INCOMING_CHANGES="\UE131 " # 
#VCS_OUTGOING_CHANGES="\uE1EC " #  #VCS_OUTGOING_CHANGES="\UE1EC " # 
#VCS_OUTGOING_CHANGES="\uE80E " #  #VCS_OUTGOING_CHANGES="\UE80E " # 
VCS_OUTGOING_CHANGES="\uE132 " #  VCS_OUTGOING_CHANGES="\UE132 " # 
VCS_TAG_ICON="\uE817 " #  VCS_TAG_ICON="\UE817 " # 
VCS_BOOKMARK_ICON="\uE87B" #  VCS_BOOKMARK_ICON="\UE87B" # 
VCS_COMMIT_ICON="\uE821 " #  VCS_COMMIT_ICON="\UE821 " # 
VCS_BRANCH_ICON="\uE220" #  VCS_BRANCH_ICON="\UE220" # 
VCS_REMOTE_BRANCH_ICON=" \uE804 " #  VCS_REMOTE_BRANCH_ICON=" \UE804 " # 
VCS_GIT_ICON="\uE20E " #  VCS_GIT_ICON="\UE20E " # 
VCS_HG_ICON="\uE1C3 " #  VCS_HG_ICON="\UE1C3 " # 
;; ;;
'compatible') 'compatible')
LEFT_SEGMENT_SEPARATOR="\u2B80" # ⮀ LEFT_SEGMENT_SEPARATOR="\U2B80" # ⮀
RIGHT_SEGMENT_SEPARATOR="\u2B82" # ⮂ RIGHT_SEGMENT_SEPARATOR="\U2B82" # ⮂
ROOT_ICON="\u26A1" # ⚡ ROOT_ICON="\U26A1" # ⚡
RUBY_ICON='' RUBY_ICON=''
AWS_ICON="AWS:" AWS_ICON="AWS:"
BACKGROUND_JOBS_ICON="\u2699" # ⚙ BACKGROUND_JOBS_ICON="\U2699" # ⚙
TEST_ICON='' TEST_ICON=''
OK_ICON="\u2713" # ✓ OK_ICON="\U2713" # ✓
FAIL_ICON="\u2718" # ✘ FAIL_ICON="\U2718" # ✘
SYMFONY_ICON="SF" SYMFONY_ICON="SF"
VCS_UNTRACKED_ICON='?' VCS_UNTRACKED_ICON='?'
VCS_UNSTAGED_ICON="\u25CF" # ● VCS_UNSTAGED_ICON="\U25CF" # ●
VCS_STAGED_ICON="\u271A" # ✚ VCS_STAGED_ICON="\U271A" # ✚
VCS_STASH_ICON="\u235F" # ⍟ VCS_STASH_ICON="\U235F" # ⍟
VCS_INCOMING_CHANGES="\u2193" # ↓ VCS_INCOMING_CHANGES="\U2193" # ↓
VCS_OUTGOING_CHANGES="\u2191" # ↑ VCS_OUTGOING_CHANGES="\U2191" # ↑
VCS_TAG_ICON='' VCS_TAG_ICON=''
VCS_BOOKMARK_ICON="\u263F" # ☿ VCS_BOOKMARK_ICON="\U263F" # ☿
VCS_COMMIT_ICON='' VCS_COMMIT_ICON=''
VCS_BRANCH_ICON='@' VCS_BRANCH_ICON='@'
VCS_REMOTE_BRANCH_ICON="\u2192" # → VCS_REMOTE_BRANCH_ICON="\U2192" # →
VCS_GIT_ICON='Git' VCS_GIT_ICON='Git'
VCS_HG_ICON='HG' VCS_HG_ICON='HG'
;; ;;
'awesome-patched') 'awesome-patched')
# Awesome-Patched Font required! # Awesome-Patched Font required!
# See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
LEFT_SEGMENT_SEPARATOR="\uE0B0" #  LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
RIGHT_SEGMENT_SEPARATOR="\uE0B2" #  RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
ROOT_ICON="\u26A1" # ⚡ ROOT_ICON="\U26A1" # ⚡
RUBY_ICON="\uE847" #  RUBY_ICON="\UE847" # 
AWS_ICON="\uE895" #  AWS_ICON="\UE895" # 
BACKGROUND_JOBS_ICON="\uE82F " #  BACKGROUND_JOBS_ICON="\UE82F " # 
TEST_ICON="\uE891" #  TEST_ICON="\UE891" # 
OK_ICON="\u2713" # ✓ OK_ICON="\U2713" # ✓
FAIL_ICON="\u2718" # ✘ FAIL_ICON="\U2718" # ✘
SYMFONY_ICON="SF" SYMFONY_ICON="SF"
VCS_UNTRACKED_ICON="\uE16C" #  VCS_UNTRACKED_ICON="\UE16C" # 
VCS_UNSTAGED_ICON="\uE17C" #  VCS_UNSTAGED_ICON="\UE17C" # 
VCS_STAGED_ICON="\uE168" #  VCS_STAGED_ICON="\UE168" # 
VCS_STASH_ICON="\uE133 " #  VCS_STASH_ICON="\UE133 " # 
#VCS_INCOMING_CHANGES="\uE1EB " #  #VCS_INCOMING_CHANGES="\UE1EB " # 
#VCS_INCOMING_CHANGES="\uE80D " #  #VCS_INCOMING_CHANGES="\UE80D " # 
VCS_INCOMING_CHANGES="\uE131 " #  VCS_INCOMING_CHANGES="\UE131 " # 
#VCS_OUTGOING_CHANGES="\uE1EC " #  #VCS_OUTGOING_CHANGES="\UE1EC " # 
#VCS_OUTGOING_CHANGES="\uE80E " #  #VCS_OUTGOING_CHANGES="\UE80E " # 
VCS_OUTGOING_CHANGES="\uE132 " #  VCS_OUTGOING_CHANGES="\UE132 " # 
VCS_TAG_ICON="\uE817 " #  VCS_TAG_ICON="\UE817 " # 
VCS_BOOKMARK_ICON="\uE87B" #  VCS_BOOKMARK_ICON="\UE87B" # 
VCS_COMMIT_ICON="\uE821 " #  VCS_COMMIT_ICON="\UE821 " # 
VCS_BRANCH_ICON="\uE220" #  VCS_BRANCH_ICON="\UE220" # 
VCS_REMOTE_BRANCH_ICON=" \uE804 " #  VCS_REMOTE_BRANCH_ICON=" \UE804 " # 
VCS_GIT_ICON="\uE20E " #  VCS_GIT_ICON="\UE20E " # 
VCS_HG_ICON="\uE1C3 " #  VCS_HG_ICON="\UE1C3 " # 
;; ;;
*) *)
# Powerline-Patched Font required! # Powerline-Patched Font required!
# See https://github.com/Lokaltog/powerline-fonts # See https://github.com/Lokaltog/powerline-fonts
LEFT_SEGMENT_SEPARATOR="\uE0B0" #  LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
RIGHT_SEGMENT_SEPARATOR="\uE0B2" #  RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
ROOT_ICON="\u26A1" # ⚡ ROOT_ICON="\U26A1" # ⚡
RUBY_ICON='' RUBY_ICON=''
AWS_ICON="AWS:" AWS_ICON="AWS:"
BACKGROUND_JOBS_ICON="\u2699" # ⚙ BACKGROUND_JOBS_ICON="\U2699" # ⚙
TEST_ICON='' TEST_ICON=''
OK_ICON="\u2713" # ✓ OK_ICON="\U2713" # ✓
FAIL_ICON="\u2718" # ✘ FAIL_ICON="\U2718" # ✘
SYMFONY_ICON="SF" SYMFONY_ICON="SF"
VCS_UNTRACKED_ICON='?' VCS_UNTRACKED_ICON='?'
VCS_UNSTAGED_ICON="\u25CF" # ● VCS_UNSTAGED_ICON="\U25CF" # ●
VCS_STAGED_ICON="\u271A" # ✚ VCS_STAGED_ICON="\U271A" # ✚
VCS_STASH_ICON="\u235F" # ⍟ VCS_STASH_ICON="\U235F" # ⍟
VCS_INCOMING_CHANGES="\u2193" # ↓ VCS_INCOMING_CHANGES="\U2193" # ↓
VCS_OUTGOING_CHANGES="\u2191" # ↑ VCS_OUTGOING_CHANGES="\U2191" # ↑
VCS_TAG_ICON='' VCS_TAG_ICON=''
VCS_BOOKMARK_ICON="\u263F" # ☿ VCS_BOOKMARK_ICON="\U263F" # ☿
VCS_COMMIT_ICON='' VCS_COMMIT_ICON=''
VCS_BRANCH_ICON="\uE0A0 " #  VCS_BRANCH_ICON="\UE0A0 " # 
VCS_REMOTE_BRANCH_ICON="\u2192" # → VCS_REMOTE_BRANCH_ICON="\U2192" # →
VCS_GIT_ICON="" VCS_GIT_ICON=""
VCS_HG_ICON="" VCS_HG_ICON=""
;; ;;
@ -502,22 +520,14 @@ prompt_longstatus() {
prompt_node_version() { prompt_node_version() {
local nvm_prompt=$(node -v 2>/dev/null) local nvm_prompt=$(node -v 2>/dev/null)
[[ -z "${nvm_prompt}" ]] && return [[ -z "${nvm_prompt}" ]] && return
NODE_ICON=$'\u2B22' # ⬢ NODE_ICON=$'\U2B22' # ⬢
$1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON" $1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON"
} }
# print a little OS icon # print a little OS icon
prompt_os_icon() { prompt_os_icon() {
if [[ "$OS" == "Darwin" ]]; then $1_prompt_segment "$0" "008" "241" "$OS_ICON"
LOGO=$'\uF8FF' # 
elif [[ "$OS" == 'Linux' ]]; then
LOGO=$'\u1F427' # 🐧
elif [[ "$OS" == 'FreeBSD' ]]; then
LOGO=$'\u1F608' # 😈
fi
$1_prompt_segment "$0" "008" "241" "$LOGO"
} }
# rbenv information # rbenv information
@ -673,7 +683,6 @@ $POWERLEVEL9K_MULTILINE_SECOND_PROMPT_PREFIX"
RPROMPT_SUFFIX='' RPROMPT_SUFFIX=''
fi fi
RPROMPT=$RPROMPT_PREFIX"%{%f%b%k%}"'$(build_right_prompt)'"%{$reset_color%}"$RPROMPT_SUFFIX RPROMPT=$RPROMPT_PREFIX"%{%f%b%k%}"'$(build_right_prompt)'"%{$reset_color%}"$RPROMPT_SUFFIX
} }
powerlevel9k_init "$@" powerlevel9k_init "$@"