System Gen36 @ 2025-05-13-22:51:15 by jonas@monolith

modules/networking/wireguard/client.nix

@@ -4,7 +4,7 @@
   ...
 }: let
   cfg = config.hive.wg.client;
-  peers = import ./peers.nix {};
+  peers = import ./peers.nix {inherit lib;};
 in {
   options.hive.wg.client = {
     enable = lib.mkEnableOption "Enable WireGuard client";
@@ -13,6 +13,11 @@ in {
       default = false;
       description = "Automatically connect to the WireGuard server with systemd";
     };
+    peer = lib.mkOption {
+      type = lib.types.singleLineStr;
+      example = "comfy-station";
+      description = "The name of the peer defined in peers.nix to incarnate";
+    };
     privateKeyFile = lib.mkOption {
       type = lib.types.path;
       description = "Path to the private key file for the WireGuard client";
@@ -21,12 +26,10 @@ in {
 
   config = lib.mkIf cfg.enable {
     networking.wg-quick.interfaces.wg0 = {
-      inherit (peers.jonas) address;
+      address = peers.clientAddress cfg.peer;
       inherit (cfg) privateKeyFile;
       autostart = cfg.autoConnect;
-      peers = [
-        peers.harbor
-      ];
+      peers = peers.forClient cfg.peer;
     };
   };
 }