xinb
/
powerlevel10k
mirror of https://github.com/romkatv/powerlevel10k.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'romkatv:master' into battery-prompt-for-windows

This commit is contained in:
Li Haoyuan 2025-02-19 10:40:07 +08:00 committed by GitHub
parent 4ab4a1353f 8fa10f43a0
commit 2cd77de6a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
README.md
View File

@ -455,15 +455,15 @@ make sure to disable the current theme in your plugin manager. See
1. Clone the repository: 1. Clone the repository:
```zsh ```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> Users in China can use the official mirror on gitee.com for faster download.<br>
中国用户可以使用 gitee.com 上的官方镜像加速下载. 中国用户可以使用 gitee.com 上的官方镜像加速下载.
```zsh ```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. Set `ZSH_THEME="powerlevel10k/powerlevel10k"` in `~/.zshrc`. 2. Open `~/.zshrc`, find the line that sets `ZSH_THEME`, and change its value to `"powerlevel10k/powerlevel10k"`.
### Prezto ### Prezto
@ -536,11 +536,6 @@ echo 'source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme' >>~/.zs
[zsh-theme-powerlevel10k-git](https://aur.archlinux.org/packages/zsh-theme-powerlevel10k-git/) [zsh-theme-powerlevel10k-git](https://aur.archlinux.org/packages/zsh-theme-powerlevel10k-git/)
referenced above is the official Powerlevel10k package. referenced above is the official Powerlevel10k package.
There is also [zsh-theme-powerlevel10k](
https://www.archlinux.org/packages/extra/x86_64/zsh-theme-powerlevel10k/) package.
Historically, [it has been breaking often and for extended periods of time](
https://github.com/romkatv/powerlevel10k/pull/786). **Do not use it.**
### Alpine Linux ### Alpine Linux
```zsh ```zsh
@ -788,6 +783,11 @@ If you are using a different terminal, proceed with manual font installation.
[basic.interface.font] [basic.interface.font]
value = "MesloLGS NF" value = "MesloLGS NF"
``` ```
- **Ghostty**: Open *Menu → Open Configuration* (Linux) or *Ghostty → Settings...* (Mac) and add
the following line:
```text
font-family = "MesloLGS NF"
```
1. Run `p10k configure` to generate a new `~/.p10k.zsh`. The old config may work 1. Run `p10k configure` to generate a new `~/.p10k.zsh`. The old config may work
incorrectly with the new font. incorrectly with the new font.
@ -857,7 +857,7 @@ The command to update Powerlevel10k depends on how it was installed.
| Installation | Update command | | Installation | Update command |
|-------------------------------|-------------------------------------------------------------| |-------------------------------|-------------------------------------------------------------|
| [Manual](#manual) | `git -C ~/powerlevel10k pull` | | [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` | | [Prezto](#prezto) | `zprezto-update` |
| [Zim](#zim) | `zimfw update` | | [Zim](#zim) | `zimfw update` |
| [Antigen](#antigen) | `antigen update` | | [Antigen](#antigen) | `antigen update` |
@ -911,7 +911,7 @@ The command to update Powerlevel10k depends on how it was installed.
| Installation | Uninstall command | | Installation | Uninstall command |
|-------------------------------|------------------------------------------------------------------| |-------------------------------|------------------------------------------------------------------|
| [Manual](#manual) | `rm -rf ~/powerlevel10k` | | [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 | | [Prezto](#prezto) | n/a |
| [Zim](#zim) | `zimfw uninstall` | | [Zim](#zim) | `zimfw uninstall` |
| [Antigen](#antigen) | `antigen purge romkatv/powerlevel10k` | | [Antigen](#antigen) | `antigen purge romkatv/powerlevel10k` |
@ -1003,7 +1003,7 @@ Powerlevel10k does not affect:
1. Run this command: 1. Run this command:
```zsh ```zsh
# Add powerlevel10k to the list of Oh My Zsh themes. # 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". # Replace ZSH_THEME="powerlevel9k/powerlevel9k" with ZSH_THEME="powerlevel10k/powerlevel10k".
sed -i.bak 's/powerlevel9k/powerlevel10k/g' ~/.zshrc sed -i.bak 's/powerlevel9k/powerlevel10k/g' ~/.zshrc
# Restart Zsh. # 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 - If `typeset -p P9K_VERSION` fails with the error `typeset: no such variable: P9K_VERSION`, run
the following command: the following command:
```zsh ```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`. 2. Restart Zsh with `exec zsh`.

5
font.md
View File

@ -168,6 +168,11 @@ If you are using a different terminal, proceed with manual font installation.
[basic.interface.font] [basic.interface.font]
value = "MesloLGS NF" value = "MesloLGS NF"
``` ```
- **Ghostty**: Open *Menu → Open Configuration* (Linux) or *Ghostty → Settings...* (Mac) and add
the following line:
```text
font-family = "MesloLGS NF"
```
1. Run `p10k configure` to generate a new `~/.p10k.zsh`. The old config may work 1. Run `p10k configure` to generate a new `~/.p10k.zsh`. The old config may work
incorrectly with the new font. incorrectly with the new font.

2
internal/p10k.zsh
View File

@ -1206,7 +1206,7 @@ prompt_aws() {
} }
_p9k_prompt_aws_init() { _p9k_prompt_aws_init() {
typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${AWS_VAULT:-${AWSUME_PROFILE:-${AWS_PROFILE:-$AWS_DEFAULT_PROFILE}}}' typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${AWS_SSO_PROFILE:-${AWS_VAULT:-${AWSUME_PROFILE:-${AWS_PROFILE:-$AWS_DEFAULT_PROFILE}}}}'
} }
################################################################ ################################################################

2
internal/parser.zsh
View File

@ -102,7 +102,7 @@ typeset -grA __p9k_pb_term_skip=(
# Usage: _p9k_parse_buffer <buffer> [token-limit] # Usage: _p9k_parse_buffer <buffer> [token-limit]
# #
# Parses the specified command line buffer and pupulates array P9K_COMMANDS # Parses the specified command line buffer and populates array P9K_COMMANDS
# with commands from it. Terminates early and returns 1 if there are more # with commands from it. Terminates early and returns 1 if there are more
# tokens than the specified limit. # tokens than the specified limit.
# #