1 files changed, 5 insertions, 7 deletions
diff --git a/modules/wireguard/nixos/default.nix b/modules/wireguard/nixos/default.nix
index 6f51ddf..ada218a 100644
--- a/modules/wireguard/nixos/default.nix
+++ b/modules/wireguard/nixos/default.nix
@@ -6,11 +6,10 @@
   cfg = config.collinux.wireguard;
 in
   lib.mkIf cfg.enable {
-    boot.extraModulePackages = [config.boot.kernelPackages.wireguard];
-    boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
-
     networking.useNetworkd = true;
     systemd.network = {
+      enable = true;
+
       netdevs."10-wg" = {
         netdevConfig = {
           Kind = "wireguard";
@@ -23,12 +22,13 @@ in
         };
 
         wireguardPeers =
-          builtins.map (m: {
+          cfg.peers
+          |> builtins.mapAttrs (_: m: {
             PublicKey = m.publicKey;
             AllowedIPs = [m.ip];
             Endpoint = m.endpoint;
           })
-          cfg.peers;
+          |> builtins.attrValues;
       };
 
       networks."12-wireguard" = {
@@ -39,8 +39,6 @@ in
           DHCP = "no";
           Gateway = cfg.gateway;
 
-          IPMasquerade = "ipv4";
-          IPv4Forwarding = true;
           IPv6AcceptRA = false;
         };
       };