Merge 7563f920c7 into 36f3045d69

internal/p10k.zsh

@@ -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
@@ -8479,6 +8483,12 @@ _p9k_init_ssh() {
   if [[ -n $SSH_CLIENT || -n $SSH_TTY || -n $SSH_CONNECTION ]]; then
     P9K_SSH=1
     return 0
+  elif [[ \
+    $(grep -i Microsoft /proc/version) && \
+    $(cmd.exe /c 'echo %SSH_CLIENT%' 2>/dev/null | sed $'s/\r//' | grep ' 22$') \
+  ]]; then
+    P9K_SSH=1
+    return 0
   fi
 
   # When changing user on a remote system, the $SSH_CONNECTION environment variable can be lost.
@@ -9499,7 +9509,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