Merge branch 'master' of github.com:brent-moffit/powerlevel10k into brent-moffit-master

6 files changed, 42 insertions, 0 deletions

diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh
index 459c243b..15242372 100644
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@@ -95,6 +95,7 @@
     todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
     timewarrior             # timewarrior tracking status (https://timewarrior.net/)
     taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
+    # arch                  # current CPU Architecture
     # time                  # current time
     # =========================[ Line #2 ]=========================
     newline                 # \n
@@ -1560,6 +1561,10 @@
   #   P9K_WIFI_NOISE        | noise in dBm, from -120 to 0
   #   P9K_WIFI_BARS         | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE)
 
+  ##############################[ arch: current cup architecture ]##############################
+  # Default CPU Aricheture (section is hidden when current architecture matches default)
+  # typeset -g POWERLEVEL9K_ARCH_DEFAULT='i386'
+
   ####################################[ time: current time ]####################################
   # Current time color.
   typeset -g POWERLEVEL9K_TIME_FOREGROUND=66
diff --git a/config/p10k-lean-8colors.zsh b/config/p10k-lean-8colors.zsh
index 8157875a..4137f0e2 100644
--- a/config/p10k-lean-8colors.zsh
+++ b/config/p10k-lean-8colors.zsh
@@ -94,6 +94,7 @@
     todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
     timewarrior             # timewarrior tracking status (https://timewarrior.net/)
     taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
+    # arch                  # current CPU Architecture
     # time                  # current time
     # =========================[ Line #2 ]=========================
     newline                 # \n
@@ -1541,6 +1542,10 @@
   #   P9K_WIFI_NOISE        | noise in dBm, from -120 to 0
   #   P9K_WIFI_BARS         | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE)
 
+  ##############################[ arch: current cup architecture ]##############################
+  # Default CPU Aricheture (section is hidden when current architecture matches default)
+  # typeset -g POWERLEVEL9K_ARCH_DEFAULT='i386'
+
   ####################################[ time: current time ]####################################
   # Current time color.
   typeset -g POWERLEVEL9K_TIME_FOREGROUND=6
diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh
index 90953751..55f9bdd0 100644
--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@@ -94,6 +94,7 @@
     todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
     timewarrior             # timewarrior tracking status (https://timewarrior.net/)
     taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
+    # arch                  # current CPU Architecture
     # time                  # current time
     # =========================[ Line #2 ]=========================
     newline
@@ -1537,6 +1538,10 @@
   #   P9K_WIFI_NOISE        | noise in dBm, from -120 to 0
   #   P9K_WIFI_BARS         | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE)
 
+  ##############################[ arch: current cup architecture ]##############################
+  # Default CPU Aricheture (section is hidden when current architecture matches default)
+  # typeset -g POWERLEVEL9K_ARCH_DEFAULT='i386'
+
   ####################################[ time: current time ]####################################
   # Current time color.
   typeset -g POWERLEVEL9K_TIME_FOREGROUND=66
diff --git a/config/p10k-rainbow.zsh b/config/p10k-rainbow.zsh
index 2f13370b..a8d2946b 100644
--- a/config/p10k-rainbow.zsh
+++ b/config/p10k-rainbow.zsh
@@ -95,6 +95,7 @@
     todo                    # todo items (https://github.com/todotxt/todo.txt-cli)
     timewarrior             # timewarrior tracking status (https://timewarrior.net/)
     taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
+    # arch                  # current CPU Architecture
     # time                  # current time
     # =========================[ Line #2 ]=========================
     newline
@@ -1645,6 +1646,10 @@
   #   P9K_WIFI_NOISE        | noise in dBm, from -120 to 0
   #   P9K_WIFI_BARS         | signal strength in bars, from 0 to 4 (derived from P9K_WIFI_RSSI and P9K_WIFI_NOISE)
 
+  ##############################[ arch: current cup architecture ]##############################
+  # Default CPU Aricheture (section is hidden when current architecture matches default)
+  # typeset -g POWERLEVEL9K_ARCH_DEFAULT='i386'
+
   ####################################[ time: current time ]####################################
   # Current time color.
   typeset -g POWERLEVEL9K_TIME_FOREGROUND=0
diff --git a/internal/icons.zsh b/internal/icons.zsh
index e3d71ffa..c67bc45d 100644
--- a/internal/icons.zsh
+++ b/internal/icons.zsh
@@ -148,6 +148,7 @@ function _p9k_init_icons() {
         JULIA_ICON                     'jl'
         SCALA_ICON                     'scala'
         TOOLBOX_ICON                   '\u2B22'               # ⬢
+        ARCH_ICON                      '\uE205'               # 
       )
     ;;
     'awesome-fontconfig')
@@ -280,6 +281,7 @@ function _p9k_init_icons() {
         JULIA_ICON                     'jl'
         SCALA_ICON                     'scala'
         TOOLBOX_ICON                   '\u2B22'               # ⬢
+        ARCH_ICON                      '\uE205'               # 
       )
     ;;
     'awesome-mapped-fontconfig')
@@ -415,6 +417,7 @@ function _p9k_init_icons() {
         JULIA_ICON                     'jl'
         SCALA_ICON                     'scala'
         TOOLBOX_ICON                   '\u2B22'                                       # ⬢
+        ARCH_ICON                      '\uE205'                                       # 
       )
     ;;
     'nerdfont-complete'|'nerdfont-fontconfig')
@@ -548,6 +551,7 @@ function _p9k_init_icons() {
         JULIA_ICON                     '\uE624'               # 
         SCALA_ICON                     '\uE737'               # 
         TOOLBOX_ICON                   '\uE20F'$s             # 
+        ARCH_ICON                      '\uE266'
       )
     ;;
     ascii)
@@ -810,6 +814,7 @@ function _p9k_init_icons() {
         JULIA_ICON                     'jl'
         SCALA_ICON                     'scala'
         TOOLBOX_ICON                   '\u2B22'               # ⬢
+        ARCH_ICON                      '\uE205'               # 
       )
     ;;
   esac
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index 08aacf79..f9e38f84 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -5644,6 +5644,23 @@ _p9k_prompt_haskell_stack_init() {
   typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$commands[stack]'
 }
 
+################################################################
+# CPU Architecture
+prompt_arch() {
+  if ! _p9k_cache_ephemeral_get $0 ; then
+    _p9k_cache_ephemeral_set $(arch)
+  fi
+  [[ $_p9k__cache_val[1] == $POWERLEVEL9K_ARCH_DEFAULT ]] && return
+  _p9k_prompt_segment "$0" "$_p9k_color1" "orange1" 'ARCH_ICON' 0 '' "$_p9k__cache_val[1]"
+}
+
+instant_prompt_arch() { prompt_arch; }
+
+_p9k_prompt_arch_init() {
+  echo 'arch init' >> ~/p9k_debug.txt
+  typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$commands[arch]'
+}
+
 # Use two preexec hooks to survive https://github.com/MichaelAquilina/zsh-you-should-use with
 # YSU_HARDCORE=1. See https://github.com/romkatv/powerlevel10k/issues/427.
 _p9k_preexec1() {