Merge 8cc3298bac into 604f19a9ea

Squashed 'gitstatus/' changes from 44504a24..075baf6e
075baf6e Fix gitstatus build failure with Apple Clang 17 (Xcode 16+) 6bcf109c Compiling on mips64 (#476) git-subtree-dir: gitstatus git-subtree-split: 075baf6ecb19f58b09c9562f33c20b842e870961
2026-03-16 20:34:54 +02:00 · 2026-03-14 07:07:11 +01:00 · 2025-06-11 04:18:35 -04:00 · 2025-06-11 04:18:29 -04:00 · 2025-06-11 04:18:24 -04:00 · 2025-06-11 04:18:21 -04:00
9 changed files with 54 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -364,6 +364,7 @@ You can enable as many segments as you like. It won't slow down your prompt or Z
 | `ram` | free RAM |
 | `ranger` | [ranger](https://github.com/ranger/ranger) shell |
 | `yazi` | [yazi](https://github.com/sxyazi/yazi) shell |
+| `vifm` | [vifm](https://github.com/vifm/vifm) shell |
 | `rbenv` | ruby environment from [rbenv](https://github.com/rbenv/rbenv) |
 | `rust_version` | [rustc](https://www.rust-lang.org) version |
 | `rvm` | ruby environment from [rvm](https://rvm.io) |
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@ -82,6 +82,7 @@
    nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
    ranger                  # ranger shell (https://github.com/ranger/ranger)
    yazi                    # yazi shell (https://github.com/sxyazi/yazi)
+    vifm                    # vifm shell (https://github.com/vifm/vifm)
    nnn                     # nnn shell (https://github.com/jarun/nnn)
    lf                      # lf shell (https://github.com/gokcehan/lf)
    xplr                    # xplr shell (https://github.com/sayanarijit/xplr)
@ -737,6 +738,12 @@
  # Custom icon.
  # typeset -g POWERLEVEL9K_YAZI_VISUAL_IDENTIFIER_EXPANSION='⭐'

+  ####################[ vifm: vifm shell (https://github.com/vifm/vifm) ]#####################
+  # Vifm shell color.
+  typeset -g POWERLEVEL9K_VIFM_FOREGROUND=178
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VIFM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
  ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]#######################
  # Nnn shell color.
  typeset -g POWERLEVEL9K_NNN_FOREGROUND=72
--- a/config/p10k-lean-8colors.zsh
+++ b/config/p10k-lean-8colors.zsh
@ -82,6 +82,7 @@
    nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
    ranger                  # ranger shell (https://github.com/ranger/ranger)
    yazi                    # yazi shell (https://github.com/sxyazi/yazi)
+    vifm                    # vifm shell (https://github.com/vifm/vifm)
    nnn                     # nnn shell (https://github.com/jarun/nnn)
    lf                      # lf shell (https://github.com/gokcehan/lf)
    xplr                    # xplr shell (https://github.com/sayanarijit/xplr)
@ -728,6 +729,12 @@
  # Custom icon.
  # typeset -g POWERLEVEL9K_YAZI_VISUAL_IDENTIFIER_EXPANSION='⭐'

+  ####################[ vifm: vifm shell (https://github.com/vifm/vifm) ]#####################
+  # Vifm shell color.
+  typeset -g POWERLEVEL9K_VIFM_FOREGROUND=3
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VIFM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
  ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]#######################
  # Nnn shell color.
  typeset -g POWERLEVEL9K_NNN_FOREGROUND=3
--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@ -82,6 +82,7 @@
    nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
    ranger                  # ranger shell (https://github.com/ranger/ranger)
    yazi                    # yazi shell (https://github.com/sxyazi/yazi)
+    vifm                    # vifm shell (https://github.com/vifm/vifm)
    nnn                     # nnn shell (https://github.com/jarun/nnn)
    lf                      # lf shell (https://github.com/gokcehan/lf)
    xplr                    # xplr shell (https://github.com/sayanarijit/xplr)
@ -728,6 +729,12 @@
  # Custom icon.
  # typeset -g POWERLEVEL9K_YAZI_VISUAL_IDENTIFIER_EXPANSION='⭐'

+  ####################[ vifm: vifm shell (https://github.com/vifm/vifm) ]#####################
+  # Vifm shell color.
+  typeset -g POWERLEVEL9K_VIFM_FOREGROUND=178
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VIFM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
  ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]#######################
  # Nnn shell color.
  typeset -g POWERLEVEL9K_NNN_FOREGROUND=72
--- a/config/p10k-rainbow.zsh
+++ b/config/p10k-rainbow.zsh
@ -82,6 +82,7 @@
    nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
    ranger                  # ranger shell (https://github.com/ranger/ranger)
    yazi                    # yazi shell (https://github.com/sxyazi/yazi)
+    vifm                    # vifm shell (https://github.com/vifm/vifm)
    nnn                     # nnn shell (https://github.com/jarun/nnn)
    lf                      # lf shell (https://github.com/gokcehan/lf)
    xplr                    # xplr shell (https://github.com/sayanarijit/xplr)
@ -757,6 +758,13 @@
  # Custom icon.
  # typeset -g POWERLEVEL9K_YAZI_VISUAL_IDENTIFIER_EXPANSION='⭐'
  
+  ####################[ vifm: vifm shell (https://github.com/vifm/vifm) ]#####################
+  # Vifm shell color.
+  typeset -g POWERLEVEL9K_VIFM_FOREGROUND=3
+  typeset -g POWERLEVEL9K_VIFM_BACKGROUND=0
+  # Custom icon.
+  # typeset -g POWERLEVEL9K_VIFM_VISUAL_IDENTIFIER_EXPANSION='⭐'
+
  ######################[ nnn: nnn shell (https://github.com/jarun/nnn) ]#######################
  # Nnn shell color.
  typeset -g POWERLEVEL9K_NNN_FOREGROUND=0
--- a/gitstatus/build
+++ b/gitstatus/build
@ -272,9 +272,9 @@ case "$gitstatus_kernel" in
      gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
    fi
    libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
-    gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
+    gitstatus_ldlibs="$gitstatus_ldlibs -liconv -lz"
    gitstatus_ldflags="$gitstatus_ldflags -L${workdir}/lib"
-    libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF"
+    libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF -DUSE_BUNDLED_ZLIB=OFF"
  ;;
  msys*|mingw*)
    gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
@ -551,6 +551,7 @@ if [ -z "$gitstatus_cpu" ]; then
    arm64|aarch64)  gitstatus_cpu=armv8-a;;
    ppc64|ppc64le)  gitstatus_cpu=powerpc64le;;
    riscv64)        gitstatus_cpu=rv64imafdc;;
+    mips64)         gitstatus_cpu=mips64;;
    loongarch64)    gitstatus_cpu=loongarch64;;
    x86_64|amd64)   gitstatus_cpu=x86-64;;
    x86)            gitstatus_cpu=i586;;
--- a/internal/icons.zsh
+++ b/internal/icons.zsh
@ -141,6 +141,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   ''
        RANGER_ICON                    '\u2B50'               # ⭐
        YAZI_ICON                      '\u2B50'               # ⭐
+        VIFM_ICON                      '\u2B50'               # ⭐
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       'vim'
        TERRAFORM_ICON                 'tf'
@ -296,6 +297,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   ''
        RANGER_ICON                    '\u2B50'               # ⭐
        YAZI_ICON                      '\u2B50'               # ⭐
+        VIFM_ICON                      '\u2B50'               # ⭐
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       'vim'
        TERRAFORM_ICON                 'tf'
@ -454,6 +456,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   ''
        RANGER_ICON                    '\u2B50'                                       # ⭐
        YAZI_ICON                      '\u2B50'                                       # ⭐
+        VIFM_ICON                      '\u2B50'                                       # ⭐
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       'vim'
        TERRAFORM_ICON                 'tf'
@ -615,6 +618,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   '\ue73f'$q             # 
        RANGER_ICON                    '\uF00b '              # 
        YAZI_ICON                      '\uF00b '              # 
+        VIFM_ICON                      '\uF00b '              # 
        MIDNIGHT_COMMANDER_ICON        'mc'                   # mc
        VIM_ICON                       '\uE62B'               # 
        TERRAFORM_ICON                 '\uF1BB '              # 
@ -771,6 +775,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   '\ue73f'$q             # 
        RANGER_ICON                    '\uF00b '              # 
        YAZI_ICON                      '\uF00b '              # 
+        VIFM_ICON                      'vifm'                 # vifm
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       '\uE62B'               # 
        TERRAFORM_ICON                 '\uF1BB '              # 
@ -924,6 +929,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   ''
        RANGER_ICON                    'ranger'
        YAZI_ICON                      'yazi'
+        VIFM_ICON                      'vifm'
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       'vim'
        TERRAFORM_ICON                 'tf'
@ -1079,6 +1085,7 @@ function _p9k_init_icons() {
        LARAVEL_ICON                   ''
        RANGER_ICON                    '\u2B50'               # ⭐
        YAZI_ICON                      '\u2B50'               # ⭐
+        VIFM_ICON                      '\u2B50'               # ⭐
        MIDNIGHT_COMMANDER_ICON        'mc'
        VIM_ICON                       'vim'
        TERRAFORM_ICON                 'tf'
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@ -4975,6 +4975,18 @@ function instant_prompt_yazi() {
  _p9k_prompt_segment prompt_yazi $_p9k_color1 yellow YAZI_ICON 1 '$YAZI_LEVEL' '$YAZI_LEVEL'
 }

+function prompt_vifm() {
+  _p9k_prompt_segment $0 $_p9k_color1 yellow VIFM_ICON 0 '' $VIFM_LEVEL
+}
+
+_p9k_prompt_vifm_init() {
+  typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$VIFM_LEVEL'
+}
+
+function instant_prompt_vifm() {
+  _p9k_prompt_segment prompt_vifm $_p9k_color1 yellow VIFM_ICON 1 '$VIFM_LEVEL' '$VIFM_LEVEL'
+}
+
 function prompt_midnight_commander() {
  local -i len=$#_p9k__prompt _p9k__has_upglob
  _p9k_prompt_segment $0 $_p9k_color1 yellow MIDNIGHT_COMMANDER_ICON 0 '' ''
--- a/internal/wizard.zsh
+++ b/internal/wizard.zsh
@ -1750,6 +1750,8 @@ function generate_config() {
      sub RANGER_VISUAL_IDENTIFIER_EXPANSION "'▲'"
      uncomment 'typeset -g POWERLEVEL9K_YAZI_VISUAL_IDENTIFIER_EXPANSION'
      sub YAZI_VISUAL_IDENTIFIER_EXPANSION "'▲'"
+      uncomment 'typeset -g POWERLEVEL9K_VIFM_VISUAL_IDENTIFIER_EXPANSION'
+      sub VIFM_VISUAL_IDENTIFIER_EXPANSION "'▲'"
      uncomment 'typeset -g POWERLEVEL9K_KUBECONTEXT_DEFAULT_VISUAL_IDENTIFIER_EXPANSION'
      sub KUBECONTEXT_DEFAULT_VISUAL_IDENTIFIER_EXPANSION "'○'"
      uncomment 'typeset -g POWERLEVEL9K_AZURE_VISUAL_IDENTIFIER_EXPANSION'
Author	SHA1	Message	Date
Faddeev-Popov	d475aeeccd	Merge `8cc3298bac` into `604f19a9ea`	2026-03-16 20:34:54 +02:00
Roman Perepelitsa	604f19a9ea	Squashed 'gitstatus/' changes from 44504a24..075baf6e 075baf6e Fix gitstatus build failure with Apple Clang 17 (Xcode 16+) 6bcf109c Compiling on mips64 (#476) git-subtree-dir: gitstatus git-subtree-split: 075baf6ecb19f58b09c9562f33c20b842e870961	2026-03-14 07:07:11 +01:00
Faddeev-Popov	8cc3298bac	update readme with vifm information	2025-06-11 04:18:35 -04:00
Faddeev-Popov	29fe575b3c	add themes support for vifm	2025-06-11 04:18:29 -04:00
Faddeev-Popov	ff6f434aa9	add visual expansion to wizard for vifm	2025-06-11 04:18:24 -04:00
Faddeev-Popov	9b3fc772e4	add prompt segment for vifm levels	2025-06-11 04:18:21 -04:00
Faddeev-Popov	f049be947c	add icon for vifm level	2025-06-11 04:17:43 -04:00