moving to pia as a vpn provider

5 files changed, 37 insertions, 24 deletions

diff --git a/.local/bin/dbshare b/.local/bin/dbshare
index 817fe8c..fdb9be2 100755
--- a/.local/bin/dbshare
+++ b/.local/bin/dbshare
@@ -2,6 +2,7 @@
 
 output="$(dropbox-cli sharelink $1)"
 
+
 case "$output" in
 	https*)
 		echo "$output" | xsel -b
@@ -10,5 +11,6 @@ $output
 It has been copied to your clipboard." ;;
 	*)
 		notify-send -a " Dropbox" "ERROR:
-Your file could not be shared." ;;
+Your file could not be shared.
+$output" ;;
 esac
diff --git a/.local/bin/dwmbar/dwmb-date b/.local/bin/dwmbar/dwmb-date
index cb6a54b..1943f10 100755
--- a/.local/bin/dwmbar/dwmb-date
+++ b/.local/bin/dwmbar/dwmb-date
@@ -3,5 +3,6 @@
 date +"  %a %b %d "
 
 case $BLOCK_BUTTON in
+	1) notify-send -a " Calendar" "$(cal | tail -n +2)" ;;
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
diff --git a/.local/bin/dwmbar/dwmb-dotfiles b/.local/bin/dwmbar/dwmb-dotfiles
index c728a41..aca2727 100755
--- a/.local/bin/dwmbar/dwmb-dotfiles
+++ b/.local/bin/dwmbar/dwmb-dotfiles
@@ -14,5 +14,7 @@ fi
 
 echo " $warn "
 case $BLOCK_BUTTON in
+		1) $TERMINAL -c dropdown -e yadm diff ;;
+		3) $TERMINAL -c dropdown -e dfup ;;
     6) "$TERMINAL" -e "$EDITOR" "$0" ;;
-esac
\ No newline at end of file
+esac
diff --git a/.local/bin/dwmbar/dwmb-vpn b/.local/bin/dwmbar/dwmb-vpn
index e08e6d6..9ddb5b5 100755
--- a/.local/bin/dwmbar/dwmb-vpn
+++ b/.local/bin/dwmbar/dwmb-vpn
@@ -1,19 +1,29 @@
 #!/bin/bash
 # Outputs if Express VPN is connected or not
 
-vpnstatus=$(expressvpn status | head -n 1)
+vpnstatus="$(piactl get connectionstate)"
 
 case "$vpnstatus" in
-	*"Not"*) icon=""
-		;;
-	*"Connected"*) icon=""
-		;;
-	*"Connecting"*) icon=" "
-		;;
-	*) icon=""
+	Disconnected) icon=" " ;;
+	Connecting) icon="  " ;;
+	Connected) icon=" " ;;
+	Interrupted) icon="  " ;;
+	Reconnecting) icon="  " ;;
+	DisconnectingToReconnect) icon="  ";;
+	Disconnecting) icon="  " ;;
 esac
 
-echo " $icon "
+# case "$vpnstatus" in
+# 	*"Not"*) icon=""
+# 		;;
+# 	*"Connected"*) icon=""
+# 		;;
+# 	*"Connecting"*) icon=" "
+# 		;;
+# 	*) icon=""
+# esac
+
+echo " $icon"
 
 
 # \033]01;31\] # pink
@@ -24,6 +34,8 @@ echo " $icon "
 # \033]01;33\] # bold yellow
 # s/onnected\sto\s//;
 case $BLOCK_BUTTON in
-	1) ~/.local/bin/vpnmenu ;;
+	1) piactl connect && notify-send -a "VPN" "Connected" && kill -36 $(pidof dwmblocks);;
+	2) vpnmenu ;;
+	3) piactl disconnect && notify-send -a "VPN" "Disonnected" && kill -36 $(pidof dwmblocks);;
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
diff --git a/.local/bin/vpnmenu b/.local/bin/vpnmenu
index d679c49..ff584e0 100755
--- a/.local/bin/vpnmenu
+++ b/.local/bin/vpnmenu
@@ -1,14 +1,10 @@
 #!/bin/sh
 
-current=$(expressvpn status | sed "s/.......................//; 1q")
-
-location=$(expressvpn list recomend | sed "1,4d; s/^.*\t//" | head | dmenu -l 10)
-
-if [ ! -n "$location" ]
-then
-	notify-send -i "$HOME/.fonts/svg/shield.svg" -a "VPN Module" "Operation aborted"
-else
-	expressvpn disconnect; expressvpn connect "$location"
-fi
-
-# expressvpn disconnect; expressvpn connect "$location"
+region="$(piactl get regions | dmenu -p "Select Region: ")"
+update=$(kill -36 $(pidof dwmblocks))
+
+[ "$region" == "" ] && notify-send -a " VPN" "Operation aborted"
+[ "$region" 	!= "" ] && piactl set region "$region" && \
+	 $update && notify-send -a " VPN" "Changed region to $region" && \
+	sleep 3 && $update
+# Comment next line if not using the vpn dwmblock