expressvpnvpn -> nordvpn

.config/polybar/config

@@ -11,7 +11,7 @@ monitor = ${env:MONITOR:eDP-1}
 include-file = ~/.config/polybar/top-bar
 modules-left = i3 arrow01 xwindow arrow0
 modules-center = term chrome editor fm music vpn
-modules-right = arrow10 redshift arrow9 expressvpn-status arrow7 wlan arrow6 pkg arrow5 pavolume arrow4 battery arrow3 backlight arrow2 networkmanager arrow1 popup-calendar
+modules-right = arrow10 redshift arrow9 vpn-nordvpn-status arrow7 wlan arrow6 pkg arrow5 pavolume arrow4 battery arrow3 backlight arrow2 networkmanager arrow1 popup-calendar
 
 ;tray-position = right
 ;tray-padding = 2
@@ -125,12 +125,10 @@ label = " %output% "
 label-foreground = ${colors.color0}
 label-background = ${colors.color6}
 
-[module/expressvpn-status]
+[module/vpn-nordvpn-status]
 type = custom/script
-exec = ~/.config/polybar/scripts/expressvpn-status.sh
+exec = ~/.config/polybar/scripts/nordvpn/vpn-nordvpn-status.sh
 interval = 5
-;format-foreground = #E5E9F0
-;format-backgound = #5E81AC
 label = " %output%"
 label-foreground = ${colors.color0} 
 label-background = ${colors.color3}
@@ -223,8 +221,8 @@ label-background = ${colors.color9}
 
 [module/temperature]
 type = internal/temperature
-thermal-zone = 7
-hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon7/temp1_input
+thermal-zone = 6
+hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon6/temp1_input
 warn-temperature = 65
 format = <ramp> <label>
 format-underline = ${colors.foreground}
@@ -316,8 +314,8 @@ click-right = st -e tmux new -s tmux1 &
 type = custom/text
 content = " "
 content-foreground = ${colors.foreground}
-click-left = "exec expressvpn connect"
-click-right = "exec expressvpn disconnect"
+click-left = "exec nordvpn connect"
+click-right = "exec nordvpn disconnect"
 
 [module/editor]
 type = custom/text

.config/polybar/scripts/expressvpn-status.sh

@@ -1,19 +0,0 @@
-
-#!/bin/sh
-
-STATUS=$(expressvpn status | cut -d " " -f 1)
-IP=$(ip route get 8.8.8.8 | head -1 | awk '{print $7}')
-SSID=$(nmcli -f SSID | head -1 | cut -d " " -f 4)
-
-if [ "$STATUS" != "Not" ]; then
-    echo " ${IP} "
-
-elif [ "$SSID" = "ASUS_5G" ] || [ "$SSID" = "ASUS" ]; then  
-    echo " ${IP} "
-
-elif [ "$SSID" = "OP3T" ] || [ "$SSID" = "Samsung" ]; then  
-    echo " ${IP} "
-
-elif [ "$SSID" != "ASUS_5G" ] || [ "$SSID" != "ASUS" ] || [ "$SSID" != "OP3T" ] || [ "$SSID" != "Samsung" ] ; then  
-    echo " ${IP} "
-fi

.config/polybar/scripts/nordvpn/vpn-nordvpn-status.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+STATUS=$(nordvpn status | grep Status | tr -d ' ' | cut -d ':' -f2)
+
+if [ "$STATUS" = "Connected" ]; then
+    echo "%{F#82E0AA}%{A1:nordvpn d:}$(nordvpn status | grep City | cut -d ':' -f2)%{A}%{F-}"
+else
+    echo "%{F#f00}%{A1:nordvpn c:}no vpn%{A}%{F-}"
+fi

addons/yay-packages

@@ -5,7 +5,6 @@ breeze-snow-cursor-theme
 chkservice
 chromium-widevine
 expac-git
-expressvpn
 fasd-git
 freerdp-git
 googler
@@ -19,6 +18,7 @@ lightdm-mini-greeter-git
 mcomix-gtk3-git
 networkmanager-dispatcher-chrony
 networkmanager-dmenu-git
+nordvpn-bin
 otf-powerline-symbols-git
 pacback
 pbincli