From 28fdf3bfeab9e4907b8ad7c29e73c1013e74c113 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Wed, 26 Jun 2024 02:29:52 +0200
Subject: [PATCH] chore: remove wireguardPeerConfig as advised by change in
 nixpkgs

---
 modules/wireguard.nix | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/modules/wireguard.nix b/modules/wireguard.nix
index 49f8a2b..94d68a6 100644
--- a/modules/wireguard.nix
+++ b/modules/wireguard.nix
@@ -231,43 +231,37 @@
           map (serverNode: let
             snCfg = wgCfgOf serverNode;
           in {
-            wireguardPeerConfig = {
-              PublicKey = builtins.readFile (peerPublicKeyPath serverNode);
-              PresharedKeyFile = config.age.secrets.${peerPresharedKeySecret nodeName serverNode}.path;
-              AllowedIPs = serverAllowedIPs serverNode;
-              Endpoint = "${snCfg.server.host}:${toString snCfg.server.port}";
-            };
+            PublicKey = builtins.readFile (peerPublicKeyPath serverNode);
+            PresharedKeyFile = config.age.secrets.${peerPresharedKeySecret nodeName serverNode}.path;
+            AllowedIPs = serverAllowedIPs serverNode;
+            Endpoint = "${snCfg.server.host}:${toString snCfg.server.port}";
           })
           (filterSelf participatingServerNodes)
           # All our external peers
           ++ mapAttrsToList (extPeer: ips: let
             peerName = externalPeerName extPeer;
           in {
-            wireguardPeerConfig = {
-              PublicKey = builtins.readFile (peerPublicKeyPath peerName);
-              PresharedKeyFile = config.age.secrets.${peerPresharedKeySecret nodeName peerName}.path;
-              AllowedIPs = map (net.cidr.make 128) ips;
-              # Connections to external peers should always be kept alive
-              PersistentKeepalive = 25;
-            };
+            PublicKey = builtins.readFile (peerPublicKeyPath peerName);
+            PresharedKeyFile = config.age.secrets.${peerPresharedKeySecret nodeName peerName}.path;
+            AllowedIPs = map (net.cidr.make 128) ips;
+            # Connections to external peers should always be kept alive
+            PersistentKeepalive = 25;
           })
           wgCfg.server.externalPeers
           # All client nodes that have their via set to us.
           ++ map (clientNode: let
             clientCfg = wgCfgOf clientNode;
           in {
-            wireguardPeerConfig = {
-              PublicKey = builtins.readFile (peerPublicKeyPath clientNode);
-              PresharedKeyFile = config.age.secrets.${peerPresharedKeySecret nodeName clientNode}.path;
-              AllowedIPs = map (net.cidr.make 128) clientCfg.addresses;
-            };
+            PublicKey = builtins.readFile (peerPublicKeyPath clientNode);
+            PresharedKeyFile = config.age.secrets.${peerPresharedKeySecret nodeName clientNode}.path;
+            AllowedIPs = map (net.cidr.make 128) clientCfg.addresses;
           })
           ourClientNodes
         else
           # We are a client node, so only include our via server.
           [
-            {
-              wireguardPeerConfig = let
+            (
+              let
                 snCfg = wgCfgOf wgCfg.client.via;
               in
                 {
@@ -279,8 +273,8 @@
                 }
                 // optionalAttrs wgCfg.client.keepalive {
                   PersistentKeepalive = 25;
-                };
-            }
+                }
+            )
           ];
     };