From 06e1964f7dd3c3364e9eb315aa18478c9c11dd1b Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 22 Dec 2024 00:22:52 -0500
Subject: [PATCH] Switch to wg-quick for clients, seems more reliable

---
 hosts/envy/default.nix                                   | 2 +-
 .../devices/networking/wireguard/client/default.nix      | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hosts/envy/default.nix b/hosts/envy/default.nix
index c1e4af6..4c8b482 100644
--- a/hosts/envy/default.nix
+++ b/hosts/envy/default.nix
@@ -10,7 +10,7 @@
   ];
 
   networking.hostName = "envy";
-  networking.wireguard.interfaces.wgc.ips = [ "10.100.0.25/24" ];
+  networking.wg-quick.interfaces.wgc.address = [ "10.100.0.25/24" ];
 
   system = {
     lanzaboote.enable = true;
diff --git a/modules/system/devices/networking/wireguard/client/default.nix b/modules/system/devices/networking/wireguard/client/default.nix
index c9e13ba..3002b23 100644
--- a/modules/system/devices/networking/wireguard/client/default.nix
+++ b/modules/system/devices/networking/wireguard/client/default.nix
@@ -7,13 +7,8 @@
 
   config = lib.mkIf config.system.wireguard.client.enable {
     networking = {
-      firewall = {
-        allowedUDPPorts = [ 51820 ];
-        trustedInterfaces = [ "wgc" ];
-      };
-
-      wireguard.interfaces.wgc = {
-        listenPort = 51820;
+      firewall.trustedInterfaces = [ "wgc" ];
+      wg-quick.interfaces.wgc = {
         privateKey = config.secrets.wgClientPriv;
         peers = [
           { # Cyberspark Server