1 files changed, 24 insertions, 8 deletions
diff --git a/nixos/modules/router.nix b/nixos/modules/router.nix
index c8b1283..224037b 100644
--- a/nixos/modules/router.nix
+++ b/nixos/modules/router.nix
@@ -44,10 +44,20 @@ in {
         '';
         description = "Mapping of MAC address to IP address";
       };
+      guestStaticLeases = mkOption {
+        type = with types; attrsOf str;
+        default = {};
+        example = ''
+          {"xx:xx:xx:xx:xx:xx" = "10.8.1.30";}
+        '';
+        description = "Mapping of MAC address to IP address";
+      };
     };
   };
 
   config = mkIf cnf.enable {
+    boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
+
     networking = {
       useNetworkd = true;
       firewall = {
@@ -98,17 +108,18 @@ in {
           matchConfig.Name = "brlan";
           networkConfig.VLAN = ["home" "guest"];
           bridgeVLANs = [
-            {bridgeVLANConfig.VLAN = 1;}
-            {bridgeVLANConfig.VLAN = 2;}
+            {VLAN = 1;}
+            {VLAN = 2;}
           ];
         };
         "home" = {
           matchConfig.Name = "home";
           networkConfig = {
             Address = "${cnf.lanIP}/${toString cnf.lanPrefix}";
-            IPForward = "yes";
+            IPv4Forwarding = "yes";
             DHCPServer = "yes";
             DHCPPrefixDelegation = "yes";
+            IPv6Forwarding = "yes";
             IPv6SendRA = "yes";
             IPv6AcceptRA = "no";
           };
@@ -121,10 +132,8 @@ in {
           };
           dhcpServerStaticLeases =
             mapAttrsToList (n: v: {
-              dhcpServerStaticLeaseConfig = {
-                MACAddress = n;
-                Address = v;
-              };
+              MACAddress = n;
+              Address = v;
             })
             cnf.staticLeases;
           dhcpPrefixDelegationConfig = {
@@ -137,9 +146,10 @@ in {
           matchConfig.Name = "guest";
           networkConfig = {
             Address = "192.168.1.1/24";
-            IPForward = "yes";
+            IPv4Forwarding = "yes";
             DHCPServer = "yes";
             DHCPPrefixDelegation = "yes";
+            IPv6Forwarding = "yes";
             IPv6SendRA = "yes";
             IPv6AcceptRA = "no";
           };
@@ -150,6 +160,12 @@ in {
             EmitDNS = "yes";
             DNS = "192.168.1.1";
           };
+          dhcpServerStaticLeases =
+            mapAttrsToList (n: v: {
+              MACAddress = n;
+              Address = v;
+            })
+            cnf.guestStaticLeases;
           dhcpPrefixDelegationConfig = {
             UplinkInterface = cnf.wan;
             SubnetId = 2;