use NORDVPN_ICON instead of LOCK_ICON in nordvpn prompt segment

pull/546/head
romkatv 5 years ago
parent 47990df0b8
commit 0f406f088d

@ -106,6 +106,7 @@ function _p9k_init_icons() {
GOLANG_ICON 'Go' GOLANG_ICON 'Go'
PUBLIC_IP_ICON 'IP' PUBLIC_IP_ICON 'IP'
LOCK_ICON '\UE138' #  LOCK_ICON '\UE138' # 
NORDVPN_ICON '\UE138' # 
EXECUTION_TIME_ICON '\UE89C'$s #  EXECUTION_TIME_ICON '\UE89C'$s # 
SSH_ICON 'ssh' SSH_ICON 'ssh'
VPN_ICON '\UE138' VPN_ICON '\UE138'
@ -228,6 +229,7 @@ function _p9k_init_icons() {
GOLANG_ICON 'Go' GOLANG_ICON 'Go'
PUBLIC_IP_ICON 'IP' PUBLIC_IP_ICON 'IP'
LOCK_ICON '\UF023' #  LOCK_ICON '\UF023' # 
NORDVPN_ICON '\UF023' # 
EXECUTION_TIME_ICON '\uF253'$s #  EXECUTION_TIME_ICON '\uF253'$s # 
SSH_ICON 'ssh' SSH_ICON 'ssh'
VPN_ICON '\uF023' VPN_ICON '\uF023'
@ -353,6 +355,7 @@ function _p9k_init_icons() {
SWIFT_ICON '\uE655'$s #  SWIFT_ICON '\uE655'$s # 
PUBLIC_IP_ICON "${CODEPOINT_OF_AWESOME_GLOBE:+\\u$CODEPOINT_OF_AWESOME_GLOBE$s}" PUBLIC_IP_ICON "${CODEPOINT_OF_AWESOME_GLOBE:+\\u$CODEPOINT_OF_AWESOME_GLOBE$s}"
LOCK_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}" LOCK_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}"
NORDVPN_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}"
EXECUTION_TIME_ICON "${CODEPOINT_OF_AWESOME_HOURGLASS_END:+\\u$CODEPOINT_OF_AWESOME_HOURGLASS_END$s}" EXECUTION_TIME_ICON "${CODEPOINT_OF_AWESOME_HOURGLASS_END:+\\u$CODEPOINT_OF_AWESOME_HOURGLASS_END$s}"
SSH_ICON 'ssh' SSH_ICON 'ssh'
VPN_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}" VPN_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}"
@ -476,6 +479,7 @@ function _p9k_init_icons() {
GOLANG_ICON '\uE626' #  GOLANG_ICON '\uE626' # 
PUBLIC_IP_ICON '\UF0AC'$s #  PUBLIC_IP_ICON '\UF0AC'$s # 
LOCK_ICON '\UF023' #  LOCK_ICON '\UF023' # 
NORDVPN_ICON '\UF023' # 
EXECUTION_TIME_ICON '\uF252'$s #  EXECUTION_TIME_ICON '\uF252'$s # 
SSH_ICON '\uF489'$s #  SSH_ICON '\uF489'$s # 
VPN_ICON '\UF023' VPN_ICON '\UF023'
@ -596,6 +600,7 @@ function _p9k_init_icons() {
GOLANG_ICON 'go' GOLANG_ICON 'go'
PUBLIC_IP_ICON 'ip' PUBLIC_IP_ICON 'ip'
LOCK_ICON '!w' LOCK_ICON '!w'
NORDVPN_ICON 'nordvpn'
EXECUTION_TIME_ICON '' EXECUTION_TIME_ICON ''
SSH_ICON 'ssh' SSH_ICON 'ssh'
VPN_ICON 'vpn' VPN_ICON 'vpn'
@ -718,6 +723,7 @@ function _p9k_init_icons() {
GOLANG_ICON 'Go' GOLANG_ICON 'Go'
PUBLIC_IP_ICON 'IP' PUBLIC_IP_ICON 'IP'
LOCK_ICON '\UE0A2' LOCK_ICON '\UE0A2'
NORDVPN_ICON '\UE0A2'
EXECUTION_TIME_ICON '' EXECUTION_TIME_ICON ''
SSH_ICON 'ssh' SSH_ICON 'ssh'
VPN_ICON 'vpn' VPN_ICON 'vpn'

@ -4291,8 +4291,8 @@ function _p9k_fetch_nordvpn_status() {
# # Display this icon when NordVPN is not installed or nordvpnd is not running # # Display this icon when NordVPN is not installed or nordvpnd is not running
# POWERLEVEL9K_NORDVPN_MISSING_VISUAL_IDENTIFIER_EXPANSION='⭐' # POWERLEVEL9K_NORDVPN_MISSING_VISUAL_IDENTIFIER_EXPANSION='⭐'
# #
# CONNECTED: NordVPN is connected. By default shows LOCK_ICON as icon and country code as content. # CONNECTED: NordVPN is connected. By default shows NORDVPN_ICON as icon and country code as
# In addition, the following variables are set for the use by # content. In addition, the following variables are set for the use by
# POWERLEVEL9K_NORDVPN_CONNECTED_VISUAL_IDENTIFIER_EXPANSION and # POWERLEVEL9K_NORDVPN_CONNECTED_VISUAL_IDENTIFIER_EXPANSION and
# POWERLEVEL9K_NORDVPN_CONNECTED_CONTENT_EXPANSION: # POWERLEVEL9K_NORDVPN_CONNECTED_CONTENT_EXPANSION:
# #
@ -4312,7 +4312,7 @@ function _p9k_fetch_nordvpn_status() {
# POWERLEVEL9K_NORDVPN_CONNECTED_CONTENT_EXPANSION='${P9K_NORDVPN_CITY}' # POWERLEVEL9K_NORDVPN_CONNECTED_CONTENT_EXPANSION='${P9K_NORDVPN_CITY}'
# #
# DISCONNECTED, CONNECTING, DISCONNECTING: NordVPN is disconnected/connecting/disconnecting. By # DISCONNECTED, CONNECTING, DISCONNECTING: NordVPN is disconnected/connecting/disconnecting. By
# default shows LOCK_ICON as icon and FAIL_ICON as content. In state CONNECTING the same # default shows NORDVPN_ICON as icon and FAIL_ICON as content. In state CONNECTING the same
# P9K_NORDVPN_* variables are set as in CONNECTED. In states DISCONNECTED and DISCONNECTING only # P9K_NORDVPN_* variables are set as in CONNECTED. In states DISCONNECTED and DISCONNECTING only
# P9K_NORDVPN_STATUS is set. Example customizations: # P9K_NORDVPN_STATUS is set. Example customizations:
# #
@ -4333,11 +4333,11 @@ function prompt_nordvpn() {
fi fi
case $P9K_NORDVPN_STATUS in case $P9K_NORDVPN_STATUS in
Connected) Connected)
_p9k_prompt_segment $0_CONNECTED blue white LOCK_ICON 0 '' "$P9K_NORDVPN_COUNTRY_CODE";; _p9k_prompt_segment $0_CONNECTED blue white NORDVPN_ICON 0 '' "$P9K_NORDVPN_COUNTRY_CODE";;
Disconnected|Connecting|Disconnecting) Disconnected|Connecting|Disconnecting)
local state=${(U)P9K_NORDVPN_STATUS} local state=${(U)P9K_NORDVPN_STATUS}
_p9k_get_icon $0_$state FAIL_ICON _p9k_get_icon $0_$state FAIL_ICON
_p9k_prompt_segment $0_$state yellow white LOCK_ICON 0 '' "$_p9k__ret";; _p9k_prompt_segment $0_$state yellow white NORDVPN_ICON 0 '' "$_p9k__ret";;
*) *)
_p9k_prompt_segment $0_MISSING blue white '' 0 '' '';; _p9k_prompt_segment $0_MISSING blue white '' 0 '' '';;
esac esac
@ -7275,7 +7275,7 @@ _p9k_must_init() {
[[ $sig == $_p9k__param_sig ]] && return 1 [[ $sig == $_p9k__param_sig ]] && return 1
_p9k_deinit _p9k_deinit
fi fi
_p9k__param_pat=$'v60\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' _p9k__param_pat=$'v61\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1'
_p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1' _p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1'
_p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1' _p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1'
_p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays' _p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays'

Loading…
Cancel
Save