Merge f257e4fd23 into 05b11d8b92

Merge branch 'tspearconquest-master'
Fix word splitting issues in README.md
2025-01-23 20:57:37 +00:00 · 2025-01-23 19:32:42 +01:00 · 2025-01-23 12:22:24 -06:00 · 2025-01-22 16:30:02 -06:00 · 2024-12-31 01:09:47 -05:00 · 2024-12-31 00:32:37 -05:00
7 changed files with 27 additions and 6 deletions
--- a/README.md
+++ b/README.md
@ -455,13 +455,13 @@ make sure to disable the current theme in your plugin manager. See

 1. Clone the repository:
    ```zsh
-    git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+    git clone --depth=1 https://github.com/romkatv/powerlevel10k.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k"
    ```
    Users in China can use the official mirror on gitee.com for faster download.<br>
    中国用户可以使用 gitee.com 上的官方镜像加速下载.

    ```zsh
-    git clone --depth=1 https://gitee.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+    git clone --depth=1 https://gitee.com/romkatv/powerlevel10k.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k"
    ```
 2. Open `~/.zshrc`, find the line that sets `ZSH_THEME`, and change its value to `"powerlevel10k/powerlevel10k"`.

@ -857,7 +857,7 @@ The command to update Powerlevel10k depends on how it was installed.
 | Installation                  | Update command                                              |
 |-------------------------------|-------------------------------------------------------------|
 | [Manual](#manual)             | `git -C ~/powerlevel10k pull`                               |
-| [Oh My Zsh](#oh-my-zsh)       | `git -C ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k pull` |
+| [Oh My Zsh](#oh-my-zsh)       | `git -C "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k" pull` |
 | [Prezto](#prezto)             | `zprezto-update`                                            |
 | [Zim](#zim)                   | `zimfw update`                                              |
 | [Antigen](#antigen)           | `antigen update`                                            |
@ -911,7 +911,7 @@ The command to update Powerlevel10k depends on how it was installed.
   | Installation                  | Uninstall command                                                |
   |-------------------------------|------------------------------------------------------------------|
   | [Manual](#manual)             | `rm -rf ~/powerlevel10k`                                         |
-   | [Oh My Zsh](#oh-my-zsh)       | `rm -rf -- ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k` |
+   | [Oh My Zsh](#oh-my-zsh)       | `rm -rf -- "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k"` |
   | [Prezto](#prezto)             | n/a                                                              |
   | [Zim](#zim)                   | `zimfw uninstall`                                                |
   | [Antigen](#antigen)           | `antigen purge romkatv/powerlevel10k`                            |
@ -1003,7 +1003,7 @@ Powerlevel10k does not affect:
 1. Run this command:
 ```zsh
 # Add powerlevel10k to the list of Oh My Zsh themes.
-git clone --depth=1 https://github.com/romkatv/powerlevel10k.git $ZSH_CUSTOM/themes/powerlevel10k
+git clone --depth=1 https://github.com/romkatv/powerlevel10k.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k"
 # Replace ZSH_THEME="powerlevel9k/powerlevel9k" with ZSH_THEME="powerlevel10k/powerlevel10k".
 sed -i.bak 's/powerlevel9k/powerlevel10k/g' ~/.zshrc
 # Restart Zsh.
@ -1574,7 +1574,7 @@ When opening a terminal, or starting zsh manually, you may encounter this error
   - If `typeset -p P9K_VERSION` fails with the error `typeset: no such variable: P9K_VERSION`, run
     the following command:
     ```zsh
-     git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+     git clone --depth=1 https://github.com/romkatv/powerlevel10k.git "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k"
     ```
 2. Restart Zsh with `exec zsh`.

--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@ -54,6 +54,7 @@
    # node_version          # node.js version
    # go_version            # go version (https://golang.org)
    # rust_version          # rustc version (https://www.rust-lang.org)
+    # zig_version           # zig version (https://ziglang.org/)
    # dotnet_version        # .NET version (https://dotnet.microsoft.com)
    # php_version           # php version (https://www.php.net/)
    # laravel_version       # laravel php framework version (https://laravel.com/)
--- a/config/p10k-lean-8colors.zsh
+++ b/config/p10k-lean-8colors.zsh
@ -54,6 +54,7 @@
    # node_version          # node.js version
    # go_version            # go version (https://golang.org)
    # rust_version          # rustc version (https://www.rust-lang.org)
+    # zig_version           # zig version (https://ziglang.org/)
    # dotnet_version        # .NET version (https://dotnet.microsoft.com)
    # php_version           # php version (https://www.php.net/)
    # laravel_version       # laravel php framework version (https://laravel.com/)
--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@ -54,6 +54,7 @@
    # node_version          # node.js version
    # go_version            # go version (https://golang.org)
    # rust_version          # rustc version (https://www.rust-lang.org)
+    # zig_version           # zig version (https://ziglang.org/)
    # dotnet_version        # .NET version (https://dotnet.microsoft.com)
    # php_version           # php version (https://www.php.net/)
    # laravel_version       # laravel php framework version (https://laravel.com/)
--- a/config/p10k-rainbow.zsh
+++ b/config/p10k-rainbow.zsh
@ -54,6 +54,7 @@
    # node_version          # node.js version
    # go_version            # go version (https://golang.org)
    # rust_version          # rustc version (https://www.rust-lang.org)
+    # zig_version           # zig version (https://ziglang.org/)
    # dotnet_version        # .NET version (https://dotnet.microsoft.com)
    # php_version           # php version (https://www.php.net/)
    # laravel_version       # laravel php framework version (https://laravel.com/)
--- a/internal/icons.zsh
+++ b/internal/icons.zsh
@ -601,6 +601,7 @@ function _p9k_init_icons() {
        SWIFT_ICON                     '\uE755'               # 
        GO_ICON                        '\uE626'               # 
        GOLANG_ICON                    '\uE626'               # 
+        ZIG_ICON                       '\uE6A9'               # 
        PUBLIC_IP_ICON                 '\UF0AC'$s             # 
        LOCK_ICON                      '\UF023'               # 
        NORDVPN_ICON                   '\UF023'               # 
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@ -2197,6 +2197,21 @@ _p9k_prompt_go_version_init() {
  typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$commands[go]'
 }

+################################################################
+# Zig prompt
+prompt_zig_version() {
+  _p9k_cached_cmd 0 '' zig version || return
+  local v=$_p9k__ret
+  if (( _POWERLEVEL9K_ZIG_VERSION_PROJECT_ONLY )); then
+    _p9k_upglob build.zig -. && return
+  fi
+  _p9k_prompt_segment "$0" "orange1" "black" "ZIG_ICON" 0 '' "${v//\%/%%}"
+}
+
+_p9k_prompt_zig_version_init() {
+  typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$commands[zig]'
+}
+
 ################################################################
 # Command number (in local history)
 prompt_history() {
@ -7653,6 +7668,7 @@ _p9k_init_params() {
  _p9k_declare -b POWERLEVEL9K_DOTNET_VERSION_PROJECT_ONLY 1
  _p9k_declare -b POWERLEVEL9K_GO_VERSION_PROJECT_ONLY 1
  _p9k_declare -b POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY 1
+  _p9k_declare -b POWERLEVEL9K_ZIG_VERSION_PROJECT_ONLY 1
  _p9k_declare -b POWERLEVEL9K_PERLBREW_PROJECT_ONLY 1
  _p9k_declare -b POWERLEVEL9K_PERLBREW_SHOW_PREFIX 0
  _p9k_declare -b POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY 0
Author	SHA1	Message	Date
Insik Lee	89221dc982	Merge `f257e4fd23` into `05b11d8b92`	2025-01-23 20:57:37 +00:00
Roman Perepelitsa	05b11d8b92	Merge branch 'tspearconquest-master'	2025-01-23 19:32:42 +01:00
Thomas D. Spear	eb487f836a	Fix word splitting issues in README.md Signed-off-by: Thomas D. Spear <thomas.spear@wcgclinical.com>	2025-01-23 12:22:24 -06:00
Thomas D. Spear	f3b05b4448	Fix word splitting issues in README.md Signed-off-by: Thomas D. Spear <thomas.spear@wcgclinical.com>	2025-01-22 16:30:02 -06:00
Insik Lee	f257e4fd23	chore: update p10k config setting with `zig_version` Make sure each config option has `zig_version` commented out ready to be used.	2024-12-31 01:09:47 -05:00
Insik Lee	2a96a782f2	Merge branch 'romkatv:master' into local	2024-12-31 00:32:37 -05:00
Insik Lee	eba4003594	Add Zig version prompt element Enable by adding `zig_version` to prompt element	2024-12-30 19:32:27 -05:00