From ac95f2128fd8b0612ee1f358a6e73cc119182964 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Sat, 7 Oct 2023 21:47:35 -0700
Subject: [PATCH] fix script for toggling vpn

---
 home/bin/executable_linux-toggle-vpn              |  9 +++++++++
 home/dot_config/sway/config.tmpl                  |  1 -
 .../sway/scripts/executable_status.sh.tmpl        |  6 +++---
 .../sway/scripts/executable_toggle-vpn.sh         |  8 --------
 provision/nixos/hosts/kestrel/configuration.nix   | 15 ---------------
 5 files changed, 12 insertions(+), 27 deletions(-)
 create mode 100644 home/bin/executable_linux-toggle-vpn
 delete mode 100644 home/dot_config/sway/scripts/executable_toggle-vpn.sh

diff --git a/home/bin/executable_linux-toggle-vpn b/home/bin/executable_linux-toggle-vpn
new file mode 100644
index 00000000..5847a92e
--- /dev/null
+++ b/home/bin/executable_linux-toggle-vpn
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [ -f ~/.wg0 ]; then
+    sudo systemctl stop wg-quick-wg0.service
+    rm ~/.wg0
+else
+    sudo systemctl restart wg-quick-wg0.service
+    touch ~/.wg0
+fi
diff --git a/home/dot_config/sway/config.tmpl b/home/dot_config/sway/config.tmpl
index 7037709b..0ccce0bb 100644
--- a/home/dot_config/sway/config.tmpl
+++ b/home/dot_config/sway/config.tmpl
@@ -127,7 +127,6 @@ mode utility {
     bindsym q exit
     bindsym r reload
     bindsym g exec "~/.config/sway/scripts/gamemode.sh", $e
-    bindsym v exec "~/.config/sway/scripts/toggle-vpn.sh {{ .hostname }}", $e
     bindsym Escape mode default
 }
 
diff --git a/home/dot_config/sway/scripts/executable_status.sh.tmpl b/home/dot_config/sway/scripts/executable_status.sh.tmpl
index b99b49fe..20f758e9 100644
--- a/home/dot_config/sway/scripts/executable_status.sh.tmpl
+++ b/home/dot_config/sway/scripts/executable_status.sh.tmpl
@@ -44,11 +44,11 @@ txmb=$(echo "scale = 1; $tx / 1280000" | bc | awk '{printf "%05.1f\n", $0}')
 rxmb=$(echo "scale = 1; $rx / 1280000" | bc | awk '{printf "%05.1f\n", $0}')
 
 # Vpn status
-vpn=$(nmcli c show --active | grep wireguard | cut -d ' ' -f1)
-if $vpn ; then
+if [ -f ~/.wg0 ] ; then
+    vpn="wg0"
+else
     vpn="none"
 fi
 
 #<span foreground='#c16b26'>lel</span>
 echo -e "👍 $txmb 👎 $rxmb | 📡 $vpn | ⬆️ $uptime_formatted | 🔉<span foreground='$volume_color'>$volume%</span> | $gamemode | 🐧 $linux_version | $date_formatted "
-
diff --git a/home/dot_config/sway/scripts/executable_toggle-vpn.sh b/home/dot_config/sway/scripts/executable_toggle-vpn.sh
deleted file mode 100644
index 326fe195..00000000
--- a/home/dot_config/sway/scripts/executable_toggle-vpn.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-cons=$(nmcli -t -f NAME c show --active | grep $1)
-if [ $cons ]; then
-    nmcli c down $1 1> /dev/null
-else
-    nmcli c up $1 1> /dev/null
-fi
diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/nixos/hosts/kestrel/configuration.nix
index b122ee64..7ce1e3f3 100644
--- a/provision/nixos/hosts/kestrel/configuration.nix
+++ b/provision/nixos/hosts/kestrel/configuration.nix
@@ -59,21 +59,6 @@
     extraGroups = [ "dialout" "wheel" "docker" "libvirtd" ]; # Enable ‘sudo’ for the user.
   };
 
-  # Allow users to start/stop wireguard vpn
-  security.sudo.extraRules = [{
-    commands = [
-      {
-        command = "${pkgs.systemc}/bin/systemctl restart wg-quick-wg0";
-        options = [ "NOPASSWD" ];
-      }
-      {
-        command = "${pkgs.systemc}/bin/systemctl stop wg-quick-wg0";
-        options = [ "NOPASSWD" ];
-      }
-    ];
-    groups = [ "wheel" ];
-  }];
-
   # List packages installed in system profile.
   environment.systemPackages = with pkgs; [
       # One-off stable packages