Merge 4364c78d11 into 3308262dfb

Merge commit '242ccfaef86ab3ab6a5f3c19f3396cdbc1049968'
Squashed 'gitstatus/' changes from 075baf6e..39d34dff
2026-08-15 19:06:25 +09:00 · 2026-08-15 11:22:58 +02:00 · 2026-08-15 11:22:58 +02:00 · 2026-08-15 10:21:46 +02:00 · 2025-08-12 21:34:12 -03:00 · 2025-08-12 21:14:30 -03:00
8 changed files with 23 additions and 19 deletions
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@ -1126,7 +1126,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

--- a/config/p10k-lean-8colors.zsh
+++ b/config/p10k-lean-8colors.zsh
@ -1101,7 +1101,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@ -1101,7 +1101,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'
  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'

--- a/config/p10k-rainbow.zsh
+++ b/config/p10k-rainbow.zsh
@ -1203,7 +1203,7 @@
  # - P9K_PACKAGE_NAME     The value of `name` field in package.json.
  # - P9K_PACKAGE_VERSION  The value of `version` field in package.json.
  #
-  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${P9K_PACKAGE_NAME//\%/%%}@${P9K_PACKAGE_VERSION//\%/%%}'
+  # typeset -g POWERLEVEL9K_PACKAGE_CONTENT_EXPANSION='${(V)P9K_PACKAGE_NAME//\%/%%}@${(V)P9K_PACKAGE_VERSION//\%/%%}'

  # Custom icon.
  # typeset -g POWERLEVEL9K_PACKAGE_VISUAL_IDENTIFIER_EXPANSION='⭐'
--- a/gitstatus/mbuild
+++ b/gitstatus/mbuild
@ -94,7 +94,9 @@
 setopt no_unset extended_glob pipe_fail prompt_percent typeset_silent \
  no_prompt_subst no_prompt_bang pushd_silent warn_create_global

-if [[ $ZSH_VERSION != (5.<1->*|<6->.*) || $ZSH_VERSION == 5.4(|.*) ]]; then
+autoload -Uz is-at-least
+
+if ! is-at-least 5.1 || [[ $ZSH_VERSION == 5.4.* ]]; then
  print -ru2 -- "[error] unsupported zsh version: $ZSH_VERSION"
  return 1
 fi
--- a/gitstatus/src/arena.h
+++ b/gitstatus/src/arena.h
@ -27,6 +27,7 @@
 #include <type_traits>
 #include <vector>

+#include "check.h"
 #include "string_view.h"

 namespace gitstatus {
@ -94,6 +95,7 @@ class Arena {
  template <class T>
  inline T* Allocate(size_t n) {
    static_assert(!std::is_reference<T>(), "");
+    CHECK(n <= SIZE_MAX / sizeof(T)) << n;
    return static_cast<T*>(Allocate(n * sizeof(T), alignof(T)));
  }

--- a/internal/icons.zsh
+++ b/internal/icons.zsh
@ -650,7 +650,7 @@ function _p9k_init_icons() {
    'nerdfont-complete'|'nerdfont-fontconfig')
      # nerd-font patched (complete) font required! See
      # https://github.com/ryanoasis/nerd-fonts
-      # http://nerdfonts.com/#cheat-sheet
+      # http://nerdfonts.com/cheat-sheet
      icons=(
        RULER_CHAR                     '\u2500'               # ─
        LEFT_SEGMENT_SEPARATOR         '\uE0B0'               # 
@ -699,15 +699,15 @@ function _p9k_init_icons() {
        LINUX_OPENSUSE_ICON            '\uF314'$s             # 
        LINUX_SABAYON_ICON             '\uF317'$s             # 
        LINUX_SLACKWARE_ICON           '\uF319'$s             # 
-        LINUX_VOID_ICON                '\uF17C'               # 
-        LINUX_ARTIX_ICON               '\uF17C'               # 
+        LINUX_VOID_ICON                '\uF32E'               # 
+        LINUX_ARTIX_ICON               '\uF31F'               # 
        LINUX_UBUNTU_ICON              '\uF31b'$s             # 
-        LINUX_KALI_ICON                '\uF17C'               # 
+        LINUX_KALI_ICON                '\uF327'               # 
        LINUX_RHEL_ICON                '\uF316'$s             # 
        LINUX_AMZN_ICON                '\uF270'$s             # 
-        LINUX_ENDEAVOUROS_ICON         '\uF17C'               # 
-        LINUX_ROCKY_ICON               '\uF17C'               # 
-        LINUX_ALMALINUX_ICON           '\uF17C'               # 
+        LINUX_ENDEAVOUROS_ICON         '\uF322'               # 
+        LINUX_ROCKY_ICON               '\uF32B'               # 
+        LINUX_ALMALINUX_ICON           '\uF31D'               # 
        LINUX_GUIX_ICON                '\uF325'$s             # 
        LINUX_NEON_ICON                '\uF17C'               # 
        LINUX_ICON                     '\uF17C'               # 
@ -737,7 +737,7 @@ function _p9k_init_icons() {
        VCS_GIT_GITHUB_ICON            '\uF113 '              # 
        VCS_GIT_BITBUCKET_ICON         '\uE703 '              # 
        VCS_GIT_GITLAB_ICON            '\uF296 '              # 
-        VCS_GIT_AZURE_ICON             '\uFD03 '              # ﴃ
+        VCS_GIT_AZURE_ICON             '\uEBE8 '              # 
        VCS_GIT_ARCHLINUX_ICON         '\uF303 '              # 
        VCS_GIT_CODEBERG_ICON          '\uF1D3 '              # 
        VCS_GIT_DEBIAN_ICON            '\uF306 '              # 
@ -762,7 +762,7 @@ function _p9k_init_icons() {
        NORDVPN_ICON                   '\UF023'               # 
        EXECUTION_TIME_ICON            '\uF252'$s             # 
        SSH_ICON                       '\uF489'$s             # 
-        VPN_ICON                       '\UF023'
+        VPN_ICON                       '\UF023'               # 
        KUBERNETES_ICON                '\U2388'               # ⎈
        DROPBOX_ICON                   '\UF16B'$s             # 
        DATE_ICON                      '\uF073 '              # 
@ -773,13 +773,13 @@ function _p9k_init_icons() {
        YAZI_ICON                      '\uF00b '              # 
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       '\uE62B'               # 
-        TERRAFORM_ICON                 '\uF1BB '              # 
+        TERRAFORM_ICON                 '\uE8BD '              # 
        PROXY_ICON                     '\u2194'               # ↔
        DOTNET_ICON                    '\uE77F'               # 
        DOTNET_CORE_ICON               '\uE77F'               # 
-        AZURE_ICON                     '\uFD03'               # ﴃ
+        AZURE_ICON                     '\uEBD8'               # 
        DIRENV_ICON                    '\u25BC'               # ▼
-        FLUTTER_ICON                   'F'
+        FLUTTER_ICON                   '\uE7DD'               # 
        GCLOUD_ICON                    '\uF7B7'               # 
        LUA_ICON                       '\uE620'               # 
        PERL_ICON                      '\uE769'               # 
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@ -2265,7 +2265,7 @@ prompt_package() {

  P9K_PACKAGE_NAME=$_p9k__cache_val[2]
  P9K_PACKAGE_VERSION=$_p9k__cache_val[3]
-  _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${P9K_PACKAGE_VERSION//\%/%%}
+  _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" PACKAGE_ICON 0 '' ${(V)P9K_PACKAGE_VERSION//\%/%%}
 }

 ################################################################
@ -9527,7 +9527,7 @@ if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file && -n $__p9k_instant_p
  zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
 fi

-typeset -g P9K_VERSION=1.20.17
+typeset -g P9K_VERSION=1.20.18

 if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then
  typeset -gri __p9k_force_term_shell_integration=1
Author	SHA1	Message	Date
Leon Alvarez	eb3024a1d9	Merge `4364c78d11` into `3308262dfb`	2026-08-15 19:06:25 +09:00
Roman Perepelitsa	3308262dfb	Merge commit '242ccfaef86ab3ab6a5f3c19f3396cdbc1049968'	2026-08-15 11:22:58 +02:00
Roman Perepelitsa	242ccfaef8	Squashed 'gitstatus/' changes from 075baf6e..39d34dff 39d34dff add a CHECK to Arena.Allocate<T>(n) git-subtree-dir: gitstatus git-subtree-split: 39d34dff4456067a0df17bdf1ea74b07c1983b39	2026-08-15 11:22:58 +02:00
Roman Perepelitsa	58e13d16a5	bug fix: slap (V) on the content of `package` (#2961 ) The same should be done with a bunch of other prompt segments.	2026-08-15 10:21:46 +02:00
Leon Alvarez	4364c78d11	fix(icons.zsh): update Linux distros and Terraform icon mappings Checked the cheat sheet, search for the logos on Internet and tried them on the console with an echo	2025-08-12 21:34:12 -03:00
Leon Alvarez	cac5839316	fix(icons.zsh): update URLs and correct icon mappings uFD03 was removed from nerdfont Use \uEBD8 (The new Azure logo) for AZURE_ICON Use \uEBE8 (Azure DevOps) for VCS_GIT_AZURE_ICON Use \UF023 (Lock) for VPN_ICON Add \uE7DD Flutter icon Fix the comment with the URL to open nerdfonts.com cheat-sheet	2025-08-12 21:14:30 -03:00