1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-22 04:10:07 +00:00

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

This commit is contained in:
Li Haoyuan 2024-11-05 16:03:14 +08:00 committed by GitHub
commit 4ab4a1353f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 22 additions and 10 deletions

View file

@ -698,6 +698,8 @@ If you are using a different terminal, proceed with manual font installation.
*Use these personal options* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`. *Use these personal options* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`.
To change the font for the remote host connections, go to *Preferences → Terminal Options → To change the font for the remote host connections, go to *Preferences → Terminal Options →
Look and Feel* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`. Look and Feel* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`.
- **Warp**: Open Warp and Navigate to *Settings* then *Appearance*. Scroll down to *Text* Section
and under *"Terminal Font"*, select the `MesloLGS NF` font.
- **WSLtty**: Right click on an open terminal and then on *Options*. In the *Text* section, under - **WSLtty**: Right click on an open terminal and then on *Options*. In the *Text* section, under
*Font*, click *"Select..."* and set Font to `MesloLGS NF Regular`. *Font*, click *"Select..."* and set Font to `MesloLGS NF Regular`.
- **Yakuake**: Click *≡**Manage Profiles**New**Appearance*. Click *Choose* next to the - **Yakuake**: Click *≡**Manage Profiles**New**Appearance*. Click *Choose* next to the

View file

@ -244,6 +244,7 @@
.perl-version .perl-version
.php-version .php-version
.tool-versions .tool-versions
.mise.toml
.shorten_folder_marker .shorten_folder_marker
.svn .svn
.terraform .terraform

View file

@ -235,6 +235,7 @@
.perl-version .perl-version
.php-version .php-version
.tool-versions .tool-versions
.mise.toml
.shorten_folder_marker .shorten_folder_marker
.svn .svn
.terraform .terraform

View file

@ -235,6 +235,7 @@
.perl-version .perl-version
.php-version .php-version
.tool-versions .tool-versions
.mise.toml
.shorten_folder_marker .shorten_folder_marker
.svn .svn
.terraform .terraform

View file

@ -244,6 +244,7 @@
.perl-version .perl-version
.php-version .php-version
.tool-versions .tool-versions
.mise.toml
.shorten_folder_marker .shorten_folder_marker
.svn .svn
.terraform .terraform

View file

@ -78,6 +78,8 @@ If you are using a different terminal, proceed with manual font installation.
*Use these personal options* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`. *Use these personal options* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`.
To change the font for the remote host connections, go to *Preferences → Terminal Options → To change the font for the remote host connections, go to *Preferences → Terminal Options →
Look and Feel* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`. Look and Feel* and change *Font:* under *Terminal UI* to `MesloLGS NF Regular`.
- **Warp**: Open Warp and Navigate to *Settings* then *Appearance*. Scroll down to *Text* Section
and under *"Terminal Font"*, select the `MesloLGS NF` font.
- **WSLtty**: Right click on an open terminal and then on *Options*. In the *Text* section, under - **WSLtty**: Right click on an open terminal and then on *Options*. In the *Text* section, under
*Font*, click *"Select..."* and set Font to `MesloLGS NF Regular`. *Font*, click *"Select..."* and set Font to `MesloLGS NF Regular`.
- **Yakuake**: Click *≡**Manage Profiles**New**Appearance*. Click *Choose* next to the - **Yakuake**: Click *≡**Manage Profiles**New**Appearance*. Click *Choose* next to the

View file

@ -5809,6 +5809,9 @@ prompt_cpu_arch() {
if _p9k_cache_ephemeral_get $0; then if _p9k_cache_ephemeral_get $0; then
state=$_p9k__cache_val[1] state=$_p9k__cache_val[1]
text=$_p9k__cache_val[2] text=$_p9k__cache_val[2]
else
if [[ -r /proc/sys/kernel/arch ]]; then
text=$(</proc/sys/kernel/arch)
else else
local cmd local cmd
for cmd in machine arch; do for cmd in machine arch; do
@ -5819,6 +5822,7 @@ prompt_cpu_arch() {
text= text=
fi fi
done done
fi
state=_${${(U)text}//İ/I} state=_${${(U)text}//İ/I}
_p9k_cache_ephemeral_set "$state" "$text" _p9k_cache_ephemeral_set "$state" "$text"
fi fi
@ -9553,7 +9557,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 zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
fi fi
typeset -g P9K_VERSION=1.20.13 typeset -g P9K_VERSION=1.20.14
if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then
typeset -gri __p9k_force_term_shell_integration=1 typeset -gri __p9k_force_term_shell_integration=1