diff --git a/clan.nix b/clan.nix index 23fc047..d03bbea 100644 --- a/clan.nix +++ b/clan.nix @@ -76,54 +76,72 @@ in hwAddress = "7c:c2:55:e0:d6:40"; ipAddress = "10.1.10.53"; }; + dhcp.from = "10.1.10.100"; + dhcp.to = "10.1.10.200"; }; lan = { id = 20; address = "10.1.20.1"; prefixLength = 24; subnet = "10.1.20.0/24"; + dhcp.from = "10.1.20.100"; + dhcp.to = "10.1.20.200"; }; iot = { id = 40; address = "10.1.40.1"; prefixLength = 24; subnet = "10.1.40.0/24"; + dhcp.from = "10.1.40.100"; + dhcp.to = "10.1.40.200"; }; voip = { id = 50; address = "10.1.50.1"; prefixLength = 24; subnet = "10.1.50.0/24"; + dhcp.from = "10.1.50.100"; + dhcp.to = "10.1.50.200"; }; dmz = { id = 60; address = "10.1.60.1"; prefixLength = 24; subnet = "10.1.60.0/24"; + dhcp.from = "10.1.60.100"; + dhcp.to = "10.1.60.200"; }; unit1 = { id = 110; address = "10.1.110.1"; prefixLength = 24; subnet = "10.1.110.0/24"; + dhcp.from = "10.1.110.100"; + dhcp.to = "10.1.110.200"; }; unit2 = { id = 120; address = "10.1.120.1"; prefixLength = 24; subnet = "10.1.120.0/24"; + dhcp.from = "10.1.120.100"; + dhcp.to = "10.1.120.200"; }; unit3 = { id = 130; address = "10.1.130.1"; prefixLength = 24; subnet = "10.1.130.0/24"; + dhcp.from = "10.1.130.100"; + dhcp.to = "10.1.130.200"; }; unit4 = { id = 140; address = "10.1.140.1"; prefixLength = 24; subnet = "10.1.140.0/24"; + dhcp.from = "10.1.140.100"; + dhcp.to = "10.1.140.200"; }; unit5 = { id = 150; @@ -134,6 +152,8 @@ in hwAddress = "7c:d3:0a:21:58:0b"; ipAddress = "10.1.150.22"; }; + dhcp.from = "10.1.150.100"; + dhcp.to = "10.1.150.200"; }; }; trunkPorts = [ "enp2s0" ]; diff --git a/modules/clan/gw-router/dns-dhcp.nix b/modules/clan/gw-router/dns-dhcp.nix index e570f86..f474afa 100644 --- a/modules/clan/gw-router/dns-dhcp.nix +++ b/modules/clan/gw-router/dns-dhcp.nix @@ -4,9 +4,11 @@ { lib, + inputs, ... }: let + libNet = lib.extend inputs.nix-lib-net.overlays.default; dhcpVlans = lib.filterAttrs (_: vlan: vlan.dhcp.enable) settings.vlans; in {