From c45898f903a95e63e0b39abf7370d4167178fac1 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 15 Jan 2024 04:15:17 +0000
Subject: [PATCH] WIP: wg-dev

---
 hosts/common/net/vpn.nix | 46 ++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/hosts/common/net/vpn.nix b/hosts/common/net/vpn.nix
index 22bb074f..d1fdfca3 100644
--- a/hosts/common/net/vpn.nix
+++ b/hosts/common/net/vpn.nix
@@ -9,19 +9,39 @@
 # N.B.: maximum interface name in Linux is 15 characters.
 let
   def-wg-vpn = name: { endpoint, publicKey, address, dns, privateKeyFile }: {
-    networking.wg-quick.interfaces."${name}" = {
-      inherit address privateKeyFile dns;
-      peers = [
-        {
-          allowedIPs = [
-            "0.0.0.0/0"
-            "::/0"
-          ];
-          inherit endpoint publicKey;
-        }
-      ];
-      # to start: `systemctl start wg-quick-${name}`
-      autostart = false;
+    # networking.wg-quick.interfaces."${name}" = {
+    #   inherit address privateKeyFile dns;
+    #   peers = [
+    #     {
+    #       allowedIPs = [
+    #         "0.0.0.0/0"
+    #         "::/0"
+    #       ];
+    #       inherit endpoint publicKey;
+    #     }
+    #   ];
+    #   # to start: `systemctl start wg-quick-${name}`
+    #   autostart = false;
+    # };
+    systemd.network.netdevs."${name}" = {
+      # see: `man 5 systemd.netdev`
+      wireguardConfig = {
+        PrivateKeyFile = privateKeyFile;
+      };
+      wireguardPeers = [{
+        AllowedIPs = [
+          "0.0.0.0/0"
+          "::/0"
+        ];
+        Endpoint = endpoint;
+        PublicKey = publicKey;
+      }];
+    };
+    systemd.network.networks."${name}" = {
+      # see: `man 5 systemd.network`
+      matchConfig.Name = name;
+      networkConfig.Address = address;
+      networkConfig.DNS = dns;
     };
   };
   def-ovpn = name: { endpoint, publicKey, address }: def-wg-vpn "ovpnd-${name}" {