@ -1,4 +1,4 @@
# vim:ft=zsh ts=2 sw=2 sts=2
# vim:ft=zsh ts=2 sw=2 sts=2 et fenc=utf-8
################################################################
################################################################
# powerlevel9k Theme
# powerlevel9k Theme
# https://github.com/bhilburn/powerlevel9k
# https://github.com/bhilburn/powerlevel9k
@ -8,9 +8,6 @@
#
#
# The `vcs_info` hooks in this file are from Tom Upton:
# The `vcs_info` hooks in this file are from Tom Upton:
# https://github.com/tupton/dotfiles/blob/master/zsh/zshrc
# https://github.com/tupton/dotfiles/blob/master/zsh/zshrc
#
# In order for this theme to render correctly, you will need a Powerline-patched font:
# https://github.com/Lokaltog/powerline-fonts
################################################################
################################################################
################################################################
################################################################
@ -43,24 +40,140 @@
# POWERLEVEL9K_COLOR_SCHEME='light'
# POWERLEVEL9K_COLOR_SCHEME='light'
################################################################
################################################################
# The `CURRENT_BG` variable is used to remember what the last BG color used was
## Debugging
# when building the left-hand prompt. Because the RPROMPT is created from
#zstyle ':vcs_info:*+*:*' debug true
# right-left but reads the opposite, this isn't necessary for the other side.
#set -o xtrace
CURRENT_BG='NONE'
# These characters require the Powerline fonts to work properly. If see boxes or
# These characters require the Powerline fonts to work properly. If see boxes or
# bizarre characters below, your fonts are not correctly installed.
# bizarre characters below, your fonts are not correctly installed. If you
LEFT_SEGMENT_SEPARATOR=''
# do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
RIGHT_SEGMENT_SEPARATOR=''
# `compatible`. This shows all icons in regular symbols.
VCS_UNSTAGED_ICON='●'
case $POWERLEVEL9K_MODE in
VCS_STAGED_ICON='✚'
'flat')
# Awesome-Patched Font required!
# 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" # ✘
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 " #
;;
'compatible')
LEFT_SEGMENT_SEPARATOR="\u2B80" # ⮀
RIGHT_SEGMENT_SEPARATOR="\u2B82" # ⮂
ROOT_ICON="\u26A1" # ⚡
RUBY_ICON=''
AWS_ICON="AWS:"
BACKGROUND_JOBS_ICON="\u2699" # ⚙
TEST_ICON=''
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_TAG_ICON=''
VCS_BOOKMARK_ICON="\u263F" # ☿
VCS_COMMIT_ICON=''
VCS_BRANCH_ICON='@'
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" # ✘
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 " #
;;
*)
# Powerline-Patched Font required!
# See https://github.com/Lokaltog/powerline-fonts
LEFT_SEGMENT_SEPARATOR="\uE0B0" #
RIGHT_SEGMENT_SEPARATOR="\uE0B2" #
ROOT_ICON="\u26A1" # ⚡
RUBY_ICON=''
AWS_ICON="AWS:"
BACKGROUND_JOBS_ICON="\u2699" # ⚙
TEST_ICON=''
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_TAG_ICON=''
VCS_BOOKMARK_ICON="\u263F" # ☿
VCS_COMMIT_ICON=''
VCS_BRANCH_ICON="\uE0A0 " #
VCS_REMOTE_BRANCH_ICON="\u2192" # →
VCS_GIT_ICON=""
VCS_HG_ICON=""
;;
esac
if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
VCS_BRANCH_ICON=''
fi
################################################################
################################################################
# color scheme
# color scheme
################################################################
################################################################
local DEFAULT_COLOR DEFAULT_COLOR_INVERTED DEFAULT_COLOR_DARK
if [[ "$POWERLEVEL9K_COLOR_SCHEME" == "light" ]]; then
if [[ $POWERLEVEL9K_COLOR_SCHEME == "light" ]]; then
DEFAULT_COLOR=white
DEFAULT_COLOR=white
DEFAULT_COLOR_INVERTED=black
DEFAULT_COLOR_INVERTED=black
DEFAULT_COLOR_DARK="252"
DEFAULT_COLOR_DARK="252"
@ -70,6 +183,17 @@ else
DEFAULT_COLOR_DARK="236"
DEFAULT_COLOR_DARK="236"
fi
fi
VCS_FOREGROUND_COLOR=$DEFAULT_COLOR
VCS_FOREGROUND_COLOR_DARK=$DEFAULT_COLOR_DARK
# If user has defined custom colors for the `vcs` segment, override the defaults
if [[ -n $POWERLEVEL9K_VCS_FOREGROUND ]]; then
VCS_FOREGROUND_COLOR=$POWERLEVEL9K_VCS_FOREGROUND
fi
if [[ -n $POWERLEVEL9K_VCS_DARK_FOREGROUND ]]; then
VCS_FOREGROUND_COLOR_DARK=$POWERLEVEL9K_VCS_DARK_FOREGROUND
fi
################################################################
################################################################
# VCS Information Settings
# VCS Information Settings
################################################################
################################################################
@ -77,31 +201,35 @@ fi
setopt prompt_subst
setopt prompt_subst
autoload -Uz vcs_info
autoload -Uz vcs_info
local VCS_WORKDIR_DIRTY=falseVCS_WORKDIR_DIRTY=false
local VCS_CHANGESET_PREFIX=''VCS_CHANGESET_PREFIX=''
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
# Default: Just display the first 12 characters of our changeset-ID.
# Default: Just display the first 12 characters of our changeset-ID.
local VCS_CHANGESET_HASH_LENGTH=12
local VCS_CHANGESET_HASH_LENGTH=12
if [[ -n $POWERLEVEL9K_CHANGESET_HASH_LENGTH ]]; then
if [[ -n " $POWERLEVEL9K_CHANGESET_HASH_LENGTH" ]]; then
VCS_CHANGESET_HASH_LENGTH=$POWERLEVEL9K_CHANGESET_HASH_LENGTH
VCS_CHANGESET_HASH_LENGTH=" $POWERLEVEL9K_CHANGESET_HASH_LENGTH"
fi
fi
VCS_CHANGESET_PREFIX="%F{$DEFAULT_COLOR_DARK}%0.$VCS_CHANGESET_HASH_LENGTH""i@%f "
VCS_CHANGESET_PREFIX="%F{$VCS_FOREGROUND_COLOR_DARK}$VCS_COMMIT_ICON%0.$VCS_CHANGESET_HASH_LENGTH""i%f "
fi
fi
zstyle ':vcs_info:*' enable git hg
zstyle ':vcs_info:*' enable git hg
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' formats " $VCS_CHANGESET_PREFIX%F{$DEFAULT_COLOR}%b%c%u%m%f"
VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%F{$VCS_FOREGROUND_COLOR}%b%c%u%m%f"
zstyle ':vcs_info:git:*' formats "%F{$VCS_FOREGROUND_COLOR}$VCS_GIT_ICON%f$VCS_DEFAULT_FORMAT"
zstyle ':vcs_info:hg:*' formats "%F{$VCS_FOREGROUND_COLOR}$VCS_HG_ICON%f$VCS_DEFAULT_FORMAT"
zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%f"
zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%f"
zstyle ':vcs_info:*' stagedstr " %F{$DEFAULT_COLOR}$VCS_STAGED_ICON%f"
zstyle ':vcs_info:*' stagedstr " %F{$VCS_FOREGROUND _COLOR}$VCS_STAGED_ICON%f"
zstyle ':vcs_info:*' unstagedstr " %F{$DEFAULT _COLOR}$VCS_UNSTAGED_ICON%f"
zstyle ':vcs_info:*' unstagedstr " %F{$VCS_FOREGROUND _COLOR}$VCS_UNSTAGED_ICON%f"
zstyle ':vcs_info:git*+set-message:*' hooks git-untracked git-aheadbehind git-stash git-remotebranch git-tagname
zstyle ':vcs_info:git*+set-message:*' hooks vcs-detect-changes git-untracked git-aheadbehind git-stash git-remotebranch git-tagname
zstyle ':vcs_info:hg*+set-message:*' hooks vcs-detect-changes
# For Hg, only show the branch name
# For Hg, only show the branch name
zstyle ':vcs_info:hg*:*' branchformat "%b"
zstyle ':vcs_info:hg*:*' branchformat "$VCS_BRANCH_ICON %b"
# The `get-revision` function must be turned on for dirty-check to work for Hg
# The `get-revision` function must be turned on for dirty-check to work for Hg
zstyle ':vcs_info:hg*:*' get-revision true
zstyle ':vcs_info:hg*:*' get-revision true
zstyle ':vcs_info:hg*:*' get-bookmarks true
zstyle ':vcs_info:hg*:*' get-bookmarks true
@ -109,56 +237,85 @@ zstyle ':vcs_info:hg*+gen-hg-bookmark-string:*' hooks hg-bookmarks
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
zstyle ':vcs_info:*' get-revision true
zstyle ':vcs_info:*' get-revision true
else
# A little performance-boost for large repositories (especially Hg). If we
# don't show the changeset, we can switch to simple mode.
zstyle ':vcs_info:*' use-simple true
fi
fi
## Debugging
#zstyle ':vcs_info:*+*:*' debug true
################################################################
################################################################
# Prompt Segment Constructors
# Prompt Segment Constructors
################################################################
################################################################
# Begin a left prompt segment
# Begin a left prompt segment
# Takes two arguments, background and foreground. Both can be omitted,
# Takes four arguments:
# rendering default background/foreground.
# * $1: Name of the function that was orginally invoked (mandatory).
# Necessary, to make the dynamic color-overwrite mechanism work.
# * $2: Background color
# * $3: Foreground color
# * $4: The segment content
# The latter three can be omitted,
left_prompt_segment() {
left_prompt_segment() {
# Overwrite given background-color by user defined variable for this segment.
# We get as first Parameter the function name, which called this function.
# From the given function name, we strip the "prompt_"-prefix and uppercase it.
# This is, prefixed with "POWERLEVEL9K_" and suffixed with either "_BACKGROUND"
# of "_FOREGROUND", our variable name. So each new Segment should automatically
# be overwritable by a variable following this naming convention.
local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
[[ -n $BG_COLOR_MODIFIER ]] && 2=$BG_COLOR_MODIFIER
# Overwrite given foreground-color by user defined variable for this segment.
local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
[[ -n $FG_COLOR_MODIFIER ]] && 3=$FG_COLOR_MODIFIER
local bg fg
local bg fg
[[ -n $1 ]] && bg="%K{$1}" || bg="%k"
[[ -n $2 ]] && bg="%K{$2}" || bg="%k"
[[ -n $2 ]] && fg="%F{$2}" || fg="%f"
[[ -n $3 ]] && fg="%F{$3}" || fg="%f"
if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
if [[ $CURRENT_BG != 'NONE' && $2 != $CURRENT_BG ]]; then
# Middle segment
echo -n "%{$bg%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR%{$fg%} "
echo -n "%{$bg%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR%{$fg%} "
else
else
# First segment
echo -n "%{$bg%}%{$fg%} "
echo -n "%{$bg%}%{$fg%} "
fi
fi
CURRENT_BG=$1
CURRENT_BG=$2
[[ -n $3 ]] && echo -n $3
[[ -n $4 ]] && echo -n "$4 "
}
}
# End the left prompt, closing any open segments
# End the left prompt, closing any open segments
left_prompt_end() {
left_prompt_end() {
if [[ -n $CURRENT_BG ]]; then
if [[ -n $CURRENT_BG ]]; then
echo -n " %{%k%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR"
echo -n "%{%k%F{$CURRENT_BG}%}$LEFT_SEGMENT_SEPARATOR"
else
else
echo -n " %{%k%}"
echo -n "%{%k%}"
fi
fi
echo -n "%{%f%}"
echo -n "%{%f%} "
CURRENT_BG=''
CURRENT_BG=''
}
}
# Begin a right prompt segment
# Begin a right prompt segment
# Takes two arguments, background and foreground. Both can be omitted,
# Takes four arguments:
# rendering default background/foreground. No ending for the right prompt
# * $1: Name of the function that was orginally invoked (mandatory).
# segment is needed (unlike the left prompt, above).
# Necessary, to make the dynamic color-overwrite mechanism work.
# * $2: Background color
# * $3: Foreground color
# * $4: The segment content
# No ending for the right prompt segment is needed (unlike the left prompt, above).
right_prompt_segment() {
right_prompt_segment() {
# Overwrite given background-color by user defined variable for this segment.
local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
[[ -n $BG_COLOR_MODIFIER ]] && 2=$BG_COLOR_MODIFIER
# Overwrite given foreground-color by user defined variable for this segment.
local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
[[ -n $FG_COLOR_MODIFIER ]] && 3=$FG_COLOR_MODIFIER
local bg fg
local bg fg
[[ -n $1 ]] && bg="%K{$1}" || bg="%k"
[[ -n $2 ]] && bg="%K{$2 }" || bg="%k"
[[ -n $2 ]] && fg="%F{$2}" || fg="%f"
[[ -n $3 ]] && fg="%F{$3 }" || fg="%f"
echo -n " %f%F{$1}$RIGHT_SEGMENT_SEPARATOR%f%{$bg%}%{$fg%} "
echo -n "%f%F{$2 }$RIGHT_SEGMENT_SEPARATOR%f%{$bg%}%{$fg%} "
[[ -n $3 ]] && echo -n $3
[[ -n $4 ]] && echo -n "$4 "
}
}
################################################################
################################################################
@ -167,21 +324,21 @@ right_prompt_segment() {
prompt_vcs() {
prompt_vcs() {
local vcs_prompt="${vcs_info_msg_0_}"
local vcs_prompt="${vcs_info_msg_0_}"
if [[ -n $vcs_prompt ]]; then
if [[ -n " $vcs_prompt" ]]; then
if [[ "$VCS_WORKDIR_DIRTY" == true ]]; then
if [[ "$VCS_WORKDIR_DIRTY" == true ]]; then
$1_prompt_segment yellow $DEFAULT_COLOR
$1_prompt_segment "$0_MODIFIED" " yellow" " $DEFAULT_COLOR"
else
else
$1_prompt_segment green $DEFAULT_COLOR
$1_prompt_segment "$0" " green" " $DEFAULT_COLOR"
fi
fi
echo -n "%F{$DEFAULT_COLOR}%f$vcs_prompt "
echo -n "%F{$VCS_FOREGROUND_COLOR}%f$vcs_prompt "
fi
fi
}
}
function +vi-git-untracked() {
function +vi-git-untracked() {
if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' && \
if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' && \
$(git ls-files --others --exclude-standard | sed q | wc -l | tr -d ' ') != 0 ]]; then
$(git ls-files --others --exclude-standard | sed q | wc -l | tr -d ' ') != 0 ]]; then
hook_com[unstaged]+=" %F{$DEFAULT_COLOR}? %f"
hook_com[unstaged]+=" %F{$VCS_FOREGROUND_COLOR}$VCS_UNTRACKED_ICON %f"
fi
fi
}
}
@ -194,12 +351,12 @@ function +vi-git-aheadbehind() {
# for git prior to 1.7
# for git prior to 1.7
# ahead=$(git rev-list origin/${branch_name}..HEAD | wc -l)
# ahead=$(git rev-list origin/${branch_name}..HEAD | wc -l)
ahead=$(git rev-list ${branch_name}@{upstream}..HEAD 2>/dev/null | wc -l | tr -d ' ')
ahead=$(git rev-list ${branch_name}@{upstream}..HEAD 2>/dev/null | wc -l | tr -d ' ')
(( $ahead )) && gitstatus+=( " %F{$DEFAULT_COLOR}↑ ${ahead// /}%f" )
(( $ahead )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$VCS_OUTGOING_CHANGES ${ahead// /}%f" )
# for git prior to 1.7
# for git prior to 1.7
# behind=$(git rev-list HEAD..origin/${branch_name} | wc -l)
# behind=$(git rev-list HEAD..origin/${branch_name} | wc -l)
behind=$(git rev-list HEAD..${branch_name}@{upstream} 2>/dev/null | wc -l | tr -d ' ')
behind=$(git rev-list HEAD..${branch_name}@{upstream} 2>/dev/null | wc -l | tr -d ' ')
(( $behind )) && gitstatus+=( " %F{$DEFAULT_COLOR}↓ ${behind// /}%f" )
(( $behind )) && gitstatus+=( " %F{$VCS_FOREGROUND_COLOR}$VCS_INCOMING_CHANGES ${behind// /}%f" )
hook_com[misc]+=${(j::)gitstatus}
hook_com[misc]+=${(j::)gitstatus}
}
}
@ -211,12 +368,12 @@ function +vi-git-remotebranch() {
remote=${$(git rev-parse --verify HEAD@{upstream} --symbolic-full-name 2>/dev/null)/refs\/(remotes|heads)\/}
remote=${$(git rev-parse --verify HEAD@{upstream} --symbolic-full-name 2>/dev/null)/refs\/(remotes|heads)\/}
branch_name=${$(git symbolic-ref --short HEAD 2>/dev/null)}
branch_name=${$(git symbolic-ref --short HEAD 2>/dev/null)}
hook_com[branch]="%F{$DEFAULT_COLOR} ${hook_com[branch]}%f"
hook_com[branch]="%F{$VCS_FOREGROUND_COLOR}$VCS_BRANCH_ICON ${hook_com[branch]}%f"
# Always show the remote
# Always show the remote
#if [[ -n ${remote} ]] ; then
#if [[ -n ${remote} ]] ; then
# Only show the remote if it differs from the local
# Only show the remote if it differs from the local
if [[ -n ${remote} && ${remote#*/} != ${branch_name} ]] ; then
if [[ -n ${remote} && ${remote#*/} != ${branch_name} ]] ; then
hook_com[branch]+="%F{$DEFAULT_COLOR}→%f%F{$DEFAULT _COLOR}${remote// /}%f"
hook_com[branch]+="%F{$VCS_FOREGROUND_COLOR}$VCS_REMOTE_BRANCH_ICON%f%F{$VCS_FOREGROUND _COLOR}${remote// /}%f"
fi
fi
}
}
@ -224,7 +381,7 @@ function +vi-git-tagname() {
local tag
local tag
tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
tag=$(git describe --tags --exact-match HEAD 2>/dev/null)
[[ -n ${tag} ]] && hook_com[branch]=" %F{$DEFAULT_COLOR} ${tag}%f"
[[ -n "${tag}" ]] && hook_com[branch]=" %F{$VCS_FOREGROUND_COLOR}$VCS_TAG_ICON ${tag}%f"
}
}
# Show count of stashed changes
# Show count of stashed changes
@ -234,24 +391,24 @@ function +vi-git-stash() {
if [[ -s $(git rev-parse --git-dir)/refs/stash ]] ; then
if [[ -s $(git rev-parse --git-dir)/refs/stash ]] ; then
stashes=$(git stash list 2>/dev/null | wc -l)
stashes=$(git stash list 2>/dev/null | wc -l)
hook_com[misc]+=" %F{$DEFAULT_COLOR}⍟ ${stashes// /}%f"
hook_com[misc]+=" %F{$VCS_FOREGROUND_COLOR}$VCS_STASH_ICON ${stashes// /}%f"
fi
fi
}
}
function +vi-hg-bookmarks() {
function +vi-hg-bookmarks() {
if [[ -n "${hgbmarks[@]}" ]]; then if [[ -n "${hgbmarks[@]}" ]]; then
hook_com[hg-bookmark-string]=" ☿ ${hgbmarks[@]} " hook_com[hg-bookmark-string]=" %F{$VCS_FOREGROUND_COLOR}$VCS_BOOKMARK_ICON${hgbmarks[@]}%f "
# And to signal, that we want to use the sting we just generated, # And to signal, that we want to use the sting we just generated,
# set the special variable `ret' to something other than the default # set the special variable `ret' to something other than the default
# zero: # zero:
ret=1 ret=1
return 0 return 0
fi fi
}
}
function +vi-vcs-detect-changes() {
function +vi-vcs-detect-changes() {
if [[ -n ${hook_com[staged]} ]] || [[ -n ${hook_com[unstaged]} ]]; then
if [[ -n " ${hook_com[staged]}" ]] || [[ -n " ${hook_com[unstaged]}" ]]; then
VCS_WORKDIR_DIRTY=true
VCS_WORKDIR_DIRTY=true
else
else
VCS_WORKDIR_DIRTY=false
VCS_WORKDIR_DIRTY=false
@ -262,12 +419,17 @@ function +vi-vcs-detect-changes() {
# Prompt Segments
# Prompt Segments
################################################################
################################################################
# 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.
CURRENT_BG='NONE'
# AWS Profile
# AWS Profile
prompt_aws() {
prompt_aws() {
local aws_profile=$AWS_DEFAULT_PROFILE
local aws_profile=" $AWS_DEFAULT_PROFILE"
if [[ -n $aws_profile ]];
if [[ -n " $aws_profile" ]];
then
then
$1_prompt_segment red white "AWS: $aws_profile"
$1_prompt_segment "$0" red white "$AWS_ICON $aws_profile"
fi
fi
}
}
@ -275,18 +437,18 @@ prompt_aws() {
# Note that if $DEFAULT_USER is not set, this prompt segment will always print
# Note that if $DEFAULT_USER is not set, this prompt segment will always print
prompt_context() {
prompt_context() {
if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
$1_prompt_segment $DEFAULT_COLOR "011" "%(!.%{%F{yellow}%}.)$USER@%m"
$1_prompt_segment "$0" " $DEFAULT_COLOR" "011" "%(!.%{%F{yellow}%}.)$USER@%m"
fi
fi
}
}
# Dir: current working directory
# Dir: current working directory
prompt_dir() {
prompt_dir() {
$1_prompt_segment blue $DEFAULT_COLOR '%~'
$1_prompt_segment "$0" " blue" " $DEFAULT_COLOR" '%~'
}
}
# Command number (in local history)
# Command number (in local history)
prompt_history() {
prompt_history() {
$1_prompt_segment "244" $DEFAULT_COLOR '%h'
$1_prompt_segment "$0" " 244" " $DEFAULT_COLOR" '%h'
}
}
# Right Status: (return code, root status, background jobs)
# Right Status: (return code, root status, background jobs)
@ -296,18 +458,18 @@ prompt_longstatus() {
local symbols bg
local symbols bg
symbols=()
symbols=()
if [[ $RETVAL -ne 0 ]]; then
if [[ " $RETVAL" -ne 0 ]]; then
symbols+="%{% F{" 226"}% }%? ↵"
symbols+="%F{226}%? ↵"
bg="009"
bg="009"
else
else
symbols+="%{%F{"046"}%}✓ "
symbols+="%{%F{"046"}%}$OK_ICON "
bg="008"
bg="008"
fi
fi
[[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡ "
[[ "$UID" -eq 0 ]] && symbols+="%{%F{yellow}%} $ROOT_ICON "
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙ "
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$BACKGROUND_JOBS_ICON "
[[ -n "$symbols" ]] && $1_prompt_segment $bg $DEFAULT_COLOR "$symbols"
[[ -n "$symbols" ]] && $1_prompt_segment "$0" " $bg" " $DEFAULT_COLOR" "$symbols"
}
}
# Node version
# Node version
@ -322,7 +484,7 @@ prompt_node_version() {
# rbenv information
# rbenv information
prompt_rbenv() {
prompt_rbenv() {
if [[ -n "$RBENV_VERSION" ]]; then
if [[ -n "$RBENV_VERSION" ]]; then
$1_prompt_segment red $DEFAULT_COLOR "$RBENV_VERSION"
$1_prompt_segment "$0" " red" " $DEFAULT_COLOR" "$RBENV_VERSION"
fi
fi
}
}
@ -332,7 +494,7 @@ prompt_rspec_stats() {
local code_amount=$(ls -1 app/**/*.rb | wc -l)
local code_amount=$(ls -1 app/**/*.rb | wc -l)
local tests_amount=$(ls -1 spec/**/*.rb | wc -l)
local tests_amount=$(ls -1 spec/**/*.rb | wc -l)
build_test_stats $1 $code_amount $tests_amount "RSpec"
build_test_stats " $1" $0 "$ code_amount" $tests_amount "RSpec $TEST_ICON "
fi
fi
}
}
@ -341,7 +503,7 @@ prompt_rvm() {
local rvm_prompt
local rvm_prompt
rvm_prompt=`rvm-prompt`
rvm_prompt=`rvm-prompt`
if [ "$rvm_prompt" != "" ]; then
if [ "$rvm_prompt" != "" ]; then
$1_prompt_segment "240" $DEFAULT_COLOR "$rvm_prompt "
$1_prompt_segment "$0" " 240" " $DEFAULT_COLOR" "$rvm_prompt $RUBY_ICON "
fi
fi
}
}
@ -350,11 +512,11 @@ prompt_rvm() {
prompt_status() {
prompt_status() {
local symbols
local symbols
symbols=()
symbols=()
[[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘ "
[[ "$RETVAL" -ne 0 ]] && symbols+="%{%F{red}%}$FAIL_ICON "
[[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡ "
[[ "$UID" -eq 0 ]] && symbols+="%{%F{yellow}%} $ROOT_ICON "
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙ "
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$BACKGROUND_JOBS_ICON "
[[ -n "$symbols" ]] && $1_prompt_segment $DEFAULT_COLOR default "$symbols"
[[ -n "$symbols" ]] && $1_prompt_segment "$0" " $DEFAULT_COLOR" " default" "$symbols"
}
}
# Symfony2-PHPUnit test ratio
# Symfony2-PHPUnit test ratio
@ -363,33 +525,41 @@ prompt_symfony2_tests() {
local code_amount=$(ls -1 src/**/*.php | grep -v Tests | wc -l)
local code_amount=$(ls -1 src/**/*.php | grep -v Tests | wc -l)
local tests_amount=$(ls -1 src/**/*.php | grep Tests | wc -l)
local tests_amount=$(ls -1 src/**/*.php | grep Tests | wc -l)
build_test_stats $1 $code_amount $tests_amount "SF2-Tests"
build_test_stats "$1" "$0" "$code_amount" "$tests_amount" "SF2 $TEST_ICON"
fi
}
# Symfony2-Version
prompt_symfony2_version() {
if [[ -f app/bootstrap.php.cache ]]; then
local symfony2_version=$(grep " VERSION " app/bootstrap.php.cache | sed -e 's/[^.0-9]*//g')
$1_prompt_segment "$0" "240" "$DEFAULT_COLOR" "$SYMFONY_ICON $symfony2_version"
fi
fi
}
}
# Show a ratio of tests vs code
# Show a ratio of tests vs code
build_test_stats() {
build_test_stats() {
local code_amount=$2
local code_amount="$3"
local tests_amount=$3+0.00001
local tests_amount="$4" +0.00001
local headline=$4
local headline="$5"
# Set float precision to 2 digits:
# Set float precision to 2 digits:
typeset -F 2 ratio
typeset -F 2 ratio
local ratio=$(( (tests_amount/code_amount) * 100 ))
local ratio=$(( (tests_amount/code_amount) * 100 ))
[[ ratio -ge 0.75 ]] && $1_prompt_segment cyan $DEFAULT_COLOR "$headline: $ratio%%"
[[ ratio -ge 0.75 ]] && $1_prompt_segment "${2}_GOOD" " cyan" " $DEFAULT_COLOR" "$headline: $ratio%%"
[[ ratio -ge 0.5 && ratio -lt 0.75 ]] && $1_prompt_segment yellow $DEFAULT_COLOR "$headline: $ratio%%"
[[ ratio -ge 0.5 && ratio -lt 0.75 ]] && $1_prompt_segment "$2_AVG" " yellow" " $DEFAULT_COLOR" "$headline: $ratio%%"
[[ ratio -lt 0.5 ]] && $1_prompt_segment red $DEFAULT_COLOR "$headline: $ratio%%"
[[ ratio -lt 0.5 ]] && $1_prompt_segment "$2_BAD" " red" " $DEFAULT_COLOR" "$headline: $ratio%%"
}
}
# System time
# System time
prompt_time() {
prompt_time() {
local time_format='%D{%H:%M:%S}'
local time_format="%D{%H:%M:%S}"
if [[ -n $POWERLEVEL9K_TIME_FORMAT ]]; then
if [[ -n " $POWERLEVEL9K_TIME_FORMAT" ]]; then
time_format=$POWERLEVEL9K_TIME_FORMAT
time_format=" $POWERLEVEL9K_TIME_FORMAT"
fi
fi
$1_prompt_segment $DEFAULT_COLOR_INVERTED $DEFAULT_COLOR "$time_format "
$1_prompt_segment "$0" " $DEFAULT_COLOR_INVERTED" " $DEFAULT_COLOR" "$time_format"
}
}
# Virtualenv: current working virtualenv
# Virtualenv: current working virtualenv
@ -397,8 +567,8 @@ prompt_time() {
# https://virtualenv.pypa.io/en/latest/
# https://virtualenv.pypa.io/en/latest/
prompt_virtualenv() {
prompt_virtualenv() {
local virtualenv_path="$VIRTUAL_ENV"
local virtualenv_path="$VIRTUAL_ENV"
if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
if [[ -n " $virtualenv_path" && -n " $VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
$1_prompt_segment blue $DEFAULT_COLOR "(`basename $virtualenv_path`)"
$1_prompt_segment "$0" " blue" " $DEFAULT_COLOR" "(`basename $virtualenv_path`)"
fi
fi
}
}
@ -408,7 +578,7 @@ prompt_virtualenv() {
# Main prompt
# Main prompt
build_left_prompt() {
build_left_prompt() {
if [[ ${#POWERLEVEL9K_LEFT_PROMPT_ELEMENTS} == 0 ]]; then
if [[ " ${#POWERLEVEL9K_LEFT_PROMPT_ELEMENTS}" == 0 ]]; then
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
fi
fi
@ -423,7 +593,7 @@ build_left_prompt() {
build_right_prompt() {
build_right_prompt() {
RETVAL=$?
RETVAL=$?
if [[ ${#POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS} == 0 ]]; then
if [[ " ${#POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS}" == 0 ]]; then
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(longstatus history time)
POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(longstatus history time)
fi
fi
@ -432,17 +602,36 @@ build_right_prompt() {
done
done
}
}
precmd() {
powerlevel9k_init() {
vcs_info
setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst)
# initialize colors
autoload -U colors && colors
# initialize VCS
autoload -Uz add-zsh-hook
add-zsh-hook precmd vcs_info
if [[ "$POWERLEVEL9K_PROMPT_ON_NEWLINE" == true ]]; then
PROMPT="╭─%{%f%b%k%}"'$(build_left_prompt)'"
╰─ "
# The right prompt should be on the same line as the first line of the left
# prompt. To do so, there is just a quite ugly workaround: Before zsh draws
# the RPROMPT, we advise it, to go one line up. At the end of RPROMPT, we
# advise it to go one line down. See:
# http://superuser.com/questions/357107/zsh-right-justify-in-ps1
RPROMPT_PREFIX='%{'$'\e[1A''%}' # one line up
RPROMPT_SUFFIX='%{'$'\e[1B''%}' # one line down
else
PROMPT="%{%f%b%k%}"'$(build_left_prompt)'
RPROMPT_PREFIX=''
RPROMPT_SUFFIX=''
fi
RPROMPT=$RPROMPT_PREFIX"%{%f%b%k%}"'$(build_right_prompt)'"%{$reset_color%}"$RPROMPT_SUFFIX
# Add a static hook to examine staged/unstaged changes.
vcs_info_hookadd set-message vcs-detect-changes
}
}
if [[ "$POWERLEVEL9K_PROMPT_ON_NEWLINE" == true ]]; then
powerlevel9k_init "$@"
PROMPT='╭─%{%f%b%k%}$(build_left_prompt)
╰─ '
else
PROMPT='%{%f%b%k%}$(build_left_prompt) '
fi
RPROMPT='%{%f%b%k%}$(build_right_prompt)%{$reset_color%}'
Dominik Ritter
9 years ago