From 1b9ed79067c91bafd2a4803bc8a93dd603596faa Mon Sep 17 00:00:00 2001
From: Alexander Bell <mail@alexbell.de>
Date: Wed, 28 May 2025 11:53:48 +0200
Subject: [PATCH] fix issue with vpn waybar button

---
 .bashrc                                    | 10 ----------
 .config/waybar/config.jsonc                |  2 +-
 .config/waybar/scripts/askpass.sh          |  0
 .config/waybar/scripts/wifi-status.sh      |  2 +-
 .config/waybar/scripts/wireguard-toggle.sh |  4 ----
 5 files changed, 2 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 .config/waybar/scripts/askpass.sh

diff --git a/.bashrc b/.bashrc
index d1fa284..e83842d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -191,16 +191,6 @@ ftext() {
 export CLICOLOR=1
 export LS_COLORS='no=00:fi=00:di=00;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:*.xml=00;31:'
 
-# Check if ripgrep is installed and change grep to ripgrep if available
-if command -v rg &> /dev/null; then
-    # Alias grep to rg if ripgrep is installed
-    alias grep='rg'
-else
-    # Alias grep to /usr/bin/grep with GREP_OPTIONS if ripgrep is not installed
-    alias grep="/usr/bin/grep $GREP_OPTIONS"
-fi
-unset GREP_OPTIONS
-
 # HAS TO BE AT THE END!!!!
 # Starship bash prompt bar
 eval "$(starship init bash)"
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 1c6960a..fee916f 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -187,7 +187,7 @@
     "return-type": "json",
     "format": "{}",
     "on-click": "~/.config/waybar/scripts/wireguard-toggle.sh",
-    "interval": 3,
+    "interval": 2,
     "min-length": 1,
     "max-length": 1
   },
diff --git a/.config/waybar/scripts/askpass.sh b/.config/waybar/scripts/askpass.sh
old mode 100644
new mode 100755
diff --git a/.config/waybar/scripts/wifi-status.sh b/.config/waybar/scripts/wifi-status.sh
index f854914..2385575 100755
--- a/.config/waybar/scripts/wifi-status.sh
+++ b/.config/waybar/scripts/wifi-status.sh
@@ -95,7 +95,7 @@ else
 
   active_device=$(nmcli -t -f DEVICE,STATE device status |
     grep -w "connected" |
-    grep -v -E "^(dummy|lo:|virbr0)" |
+    grep -v -E "^(dummy|lo|virbr0|wg0):" |
     awk -F: '{print $1}')
 
   if [ -n "$active_device" ]; then
diff --git a/.config/waybar/scripts/wireguard-toggle.sh b/.config/waybar/scripts/wireguard-toggle.sh
index 7531000..b1537ca 100755
--- a/.config/waybar/scripts/wireguard-toggle.sh
+++ b/.config/waybar/scripts/wireguard-toggle.sh
@@ -7,10 +7,6 @@ function status_wireguard() {
   return $?
 }
 
-function askpass() {
-  rofi -dmenu -password -no-fixed-num-lines -p "Sudo password" 
-}
-
 status_wireguard && \
 SUDO_ASKPASS=~/.config/waybar/scripts/askpass.sh sudo -A systemctl stop $SERVICE_NAME || \
 SUDO_ASKPASS=~/.config/waybar/scripts/askpass.sh sudo -A systemctl start $SERVICE_NAME