Compare commits

...

3 Commits

Author SHA1 Message Date
Shaheen Gandhi 1da6a65845
Merge 44ade697bf into 36f3045d69 2025-04-29 15:31:58 +01:00
Roman Perepelitsa 36f3045d69 disable nordvpn as it is broken after the last upstream update (#2860) 2025-04-29 15:00:53 +02:00
Shaheen Gandhi 44ade697bf ssh: optimize detection 2024-10-15 22:45:19 -07:00
1 changed files with 7 additions and 2 deletions

View File

@ -4918,6 +4918,10 @@ function _p9k_fetch_nordvpn_status() {
# POWERLEVEL9K_NORDVPN_CONNECTING_CONTENT_EXPANSION='${P9K_NORDVPN_COUNTRY_CODE}'
# POWERLEVEL9K_NORDVPN_CONNECTING_BACKGROUND=cyan
function prompt_nordvpn() {
# This prompt segment is broken. See https://github.com/romkatv/powerlevel10k/issues/2860.
# It is disabled until it is fixed.
return
unset $__p9k_nordvpn_tag P9K_NORDVPN_COUNTRY_CODE
[[ -e /run/nordvpn/nordvpnd.sock ]] || return
_p9k_fetch_nordvpn_status 2>/dev/null || return
@ -8483,7 +8487,8 @@ _p9k_init_ssh() {
# When changing user on a remote system, the $SSH_CONNECTION environment variable can be lost.
# Attempt detection via `who`.
(( $+commands[who] )) || return
[[ -z "$(command -v who)" ]] && return
#(( $+commands[who] )) || return
local ipv6='(([0-9a-fA-F]+:)|:){2,}[0-9a-fA-F]+' # Simplified, only checks partial pattern.
local ipv4='([0-9]{1,3}\.){3}[0-9]+' # Simplified, allows invalid ranges.
@ -9499,7 +9504,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.14
typeset -g P9K_VERSION=1.20.15
if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then
typeset -gri __p9k_force_term_shell_integration=1