xinb
/
powerlevel10k
mirror of https://github.com/romkatv/powerlevel10k.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

My changes on icons.zsh file and small fix on "vcs" to fix some unaspected behaviour

This commit is contained in:
jD4rk 2020-01-29 01:02:13 +01:00
parent 0a4b832b25
commit 6996f22570
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gitstatus/_HowTo_run_a_query Normal file
View File

@ -0,0 +1,6 @@
source gitstatus.plugin.zsh
gitstatus_start MY
gitstatus_query -d $PWD MY
typeset -m 'VCS_STATUS_*'

8
internal/icons.zsh
View File

@ -372,7 +372,9 @@ function _p9k_init_icons() {
BACKGROUND_JOBS_ICON '\uF013 ' #  BACKGROUND_JOBS_ICON '\uF013 ' # 
TEST_ICON '\uF188 ' #  TEST_ICON '\uF188 ' # 
TODO_ICON '\u2611' # ☑ TODO_ICON '\u2611' # ☑
BATTERY_ICON '\UF240 ' #  BATTERY_ICON '\UF240 ' #  upTo F244 (5 icons in total) from full to empty
BATTERY_ICON_UNKNOW '\uF590 ' #  '\uF582' 
BATTERY_ICON_AC '\uF492 ' # 
DISK_ICON '\uF0A0 ' #  DISK_ICON '\uF0A0 ' # 
OK_ICON '\uF00C ' #  OK_ICON '\uF00C ' # 
FAIL_ICON '\uF00D' #  FAIL_ICON '\uF00D' # 
@ -419,8 +421,8 @@ function _p9k_init_icons() {
VCS_UNSTAGED_ICON '\uF06A ' #  VCS_UNSTAGED_ICON '\uF06A ' # 
VCS_STAGED_ICON '\uF055 ' #  VCS_STAGED_ICON '\uF055 ' # 
VCS_STASH_ICON '\uF01C ' #  VCS_STASH_ICON '\uF01C ' # 
VCS_INCOMING_CHANGES_ICON '\uF01A ' #  VCS_INCOMING_CHANGES_ICON '\uF0AB ' # 
VCS_OUTGOING_CHANGES_ICON '\uF01B ' #  VCS_OUTGOING_CHANGES_ICON '\uF0AA ' # 
VCS_TAG_ICON '\uF02B ' #  VCS_TAG_ICON '\uF02B ' # 
VCS_BOOKMARK_ICON '\uF461 ' #  VCS_BOOKMARK_ICON '\uF461 ' # 
VCS_COMMIT_ICON '\uE729 ' #  VCS_COMMIT_ICON '\uE729 ' # 

8
internal/p10k.zsh
View File

@ -3126,6 +3126,7 @@ typeset -gA __p9k_vcs_states=(
'UNTRACKED' '2' 'UNTRACKED' '2'
'LOADING' '8' 'LOADING' '8'
'CONFLICTED' '3' 'CONFLICTED' '3'
'STASHED' '208' # add
) )
function +vi-git-untracked() { function +vi-git-untracked() {
@ -3418,16 +3419,21 @@ function _p9k_vcs_render() {
if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); then if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); then
if [[ -z $state ]]; then if [[ -z $state ]]; then
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then #echo "myMOD"
#if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; # old
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 ]]; then # new
state=CONFLICTED state=CONFLICTED
elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
state=MODIFIED state=MODIFIED
elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
state=UNTRACKED state=UNTRACKED
elif [[ $VCS_STATUS_STASHES != 0 ]]; then # add
state=STASHED # add
else else
state=CLEAN state=CLEAN
fi fi
fi fi
_p9k_vcs_icon _p9k_vcs_icon
_p9k_prompt_segment prompt_vcs_$state "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$_p9k_ret" 0 '' "" _p9k_prompt_segment prompt_vcs_$state "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$_p9k_ret" 0 '' ""
return 0 return 0