From 6996f22570d57fa6342b531d42ef222ae23efe96 Mon Sep 17 00:00:00 2001
From: jD4rk <jdm0b1l3@gmail.com>
Date: Wed, 29 Jan 2020 01:02:13 +0100
Subject: [PATCH] My changes on icons.zsh file and small fix on "vcs" to fix
 some unaspected behaviour

---
 gitstatus/_HowTo_run_a_query | 6 ++++++
 internal/icons.zsh           | 8 +++++---
 internal/p10k.zsh            | 8 +++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 gitstatus/_HowTo_run_a_query

diff --git a/gitstatus/_HowTo_run_a_query b/gitstatus/_HowTo_run_a_query
new file mode 100644
index 00000000..9e5d9984
--- /dev/null
+++ b/gitstatus/_HowTo_run_a_query
@@ -0,0 +1,6 @@
+source gitstatus.plugin.zsh
+
+gitstatus_start MY
+gitstatus_query -d $PWD MY
+typeset -m 'VCS_STATUS_*'
+
diff --git a/internal/icons.zsh b/internal/icons.zsh
index a96b747c..60780e62 100644
--- a/internal/icons.zsh
+++ b/internal/icons.zsh
@@ -372,7 +372,9 @@ function _p9k_init_icons() {
         BACKGROUND_JOBS_ICON           '\uF013 '              # 
         TEST_ICON                      '\uF188 '              # 
         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 '              # 
         OK_ICON                        '\uF00C '              # 
         FAIL_ICON                      '\uF00D'               # 
@@ -419,8 +421,8 @@ function _p9k_init_icons() {
         VCS_UNSTAGED_ICON              '\uF06A '              # 
         VCS_STAGED_ICON                '\uF055 '              # 
         VCS_STASH_ICON                 '\uF01C '              # 
-        VCS_INCOMING_CHANGES_ICON      '\uF01A '              # 
-        VCS_OUTGOING_CHANGES_ICON      '\uF01B '              # 
+        VCS_INCOMING_CHANGES_ICON      '\uF0AB '              # 
+        VCS_OUTGOING_CHANGES_ICON      '\uF0AA '              # 
         VCS_TAG_ICON                   '\uF02B '              # 
         VCS_BOOKMARK_ICON              '\uF461 '              # 
         VCS_COMMIT_ICON                '\uE729 '              # 
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index a2c3f756..7601936a 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -3126,6 +3126,7 @@ typeset -gA __p9k_vcs_states=(
   'UNTRACKED'     '2'
   'LOADING'       '8'
   'CONFLICTED'    '3'
+  'STASHED'       '208'           # add
 )
 
 function +vi-git-untracked() {
@@ -3418,16 +3419,21 @@ function _p9k_vcs_render() {
 
   if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); 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
       elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
         state=MODIFIED
       elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
         state=UNTRACKED
+      elif [[ $VCS_STATUS_STASHES != 0 ]]; then                                                         # add
+        state=STASHED                                                                                   # add
       else
         state=CLEAN
       fi
     fi
+
     _p9k_vcs_icon
     _p9k_prompt_segment prompt_vcs_$state "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$_p9k_ret" 0 '' ""
     return 0