Merge branch 'next' into dritter/improve_shorten_dir_length

This commit is contained in:
Dominik Ritter 2015-08-27 18:31:10 +02:00
commit 3e0547a9cb
2 changed files with 39 additions and 29 deletions

View file

@ -1,7 +1,7 @@
## powerlevel9k Theme for ZSH ## powerlevel9k Theme for ZSH
Powerlevel9k is a theme for ZSH which uses [Powerline Powerlevel9k is a theme for ZSH which uses [Powerline
Fonts](https://github.com/Lokaltog/powerline-fonts). It can be used with vanilla Fonts](https://github.com/powerline/fonts). It can be used with vanilla
ZSH, [Oh-My-Zsh](https://github.com/robbyrussell/oh-my-zsh), or ZSH, [Oh-My-Zsh](https://github.com/robbyrussell/oh-my-zsh), or
[Prezto](https://github.com/sorin-ionescu/prezto), and can also be installed [Prezto](https://github.com/sorin-ionescu/prezto), and can also be installed
using [antigen](https://github.com/zsh-users/antigen). using [antigen](https://github.com/zsh-users/antigen).
@ -54,6 +54,7 @@ this theme focus on four primary goals:
- [Troubleshooting](#troubleshooting) - [Troubleshooting](#troubleshooting)
- [Gaps Between Segments](#gaps-between-segments) - [Gaps Between Segments](#gaps-between-segments)
- [Segment Colors are Wrong](#segment-colors-are-wrong) - [Segment Colors are Wrong](#segment-colors-are-wrong)
- [Strange Characters in prompt](#strange-characters-in-prompt)
- [Meta](#meta) - [Meta](#meta)
- [Kudos](#kudos) - [Kudos](#kudos)
- [Developing](#developing) - [Developing](#developing)
@ -474,12 +475,21 @@ terminal, which should yield `256`. If you see something different, try setting
TERM=xterm-256color TERM=xterm-256color
#### Strange Characters in prompt
If your prompt shows strange character like this:
![](https://cloud.githubusercontent.com/assets/1544760/9156161/e0e584e6-3ed0-11e5-897a-2318a8e32d35.png)
it is most likely that you set `POWERLEVEL9K_MODE="awesome-patched"`, but
did not install an [awesome-font](https://github.com/gabrielelana/awesome-terminal-fonts). For most other modes, you need a [powerline-patched](https://github.com/powerline/fonts) font.
### Meta ### Meta
#### Kudos #### Kudos
This theme wouldn't have happened without inspiration from the original This theme wouldn't have happened without inspiration from the original
[agnoster](https://gist.github.com/agnoster/3712874) Oh-My-ZSH theme. [agnoster](https://github.com/agnoster/agnoster-zsh-theme) ZSH theme.
Before creating this theme, I also tried [jeremyFreeAgent's Before creating this theme, I also tried [jeremyFreeAgent's
theme](https://github.com/jeremyFreeAgent/oh-my-zsh-powerline-theme) and theme](https://github.com/jeremyFreeAgent/oh-my-zsh-powerline-theme) and

View file

@ -90,31 +90,31 @@ case $POWERLEVEL9K_MODE in
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"
APPLE_ICON='OSX' APPLE_ICON='OSX'
FREEBSD_ICON='BSD' FREEBSD_ICON='BSD'
LINUX_ICON='Lx' LINUX_ICON='Lx'
SUNOS_ICON='Sun' SUNOS_ICON='Sun'
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'
;; ;;
@ -156,31 +156,31 @@ case $POWERLEVEL9K_MODE in
*) *)
# 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"
APPLE_ICON='OSX' APPLE_ICON='OSX'
FREEBSD_ICON='BSD' FREEBSD_ICON='BSD'
LINUX_ICON='Lx' LINUX_ICON='Lx'
SUNOS_ICON='Sun' SUNOS_ICON='Sun'
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=""
;; ;;