From 47f7641de431823ddb7d62485d94604cfe5a9208 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 26 Nov 2024 20:41:55 -0500 Subject: [PATCH] Infini-FRAMEWORK: move NAT into specialisation --- hosts/Infini-FRAMEWORK/default.nix | 73 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix index 294882f..606f69a 100644 --- a/hosts/Infini-FRAMEWORK/default.nix +++ b/hosts/Infini-FRAMEWORK/default.nix @@ -101,53 +101,54 @@ } ]; - networking = { - interfaces = { - "wlp170s0".useDHCP = true; - "enp0s13f0u1" = { + specialisation.router.configuration = { + networking = { + interfaces."enp0s13f0u1" = { ipv4.addresses = [{ address = "192.168.100.1"; prefixLength = 24; }]; }; - }; - firewall.interfaces = { - "enp0s13f0u1".allowedTCPPorts = [ 53 ]; - "enp0s13f0u1".allowedUDPPorts = [ 53 67 ]; + + firewall.interfaces."enp0s13f0u1" = { + allowedTCPPorts = [ 53 ]; + allowedUDPPorts = [ 53 67 ]; + }; + + nat = { + enable = true; + internalInterfaces = [ "enp0s13f0u1" ]; + externalInterface = "wlp170s0"; + }; }; - nat = { + services.dnsmasq = { enable = true; - internalInterfaces = [ "enp0s13f0u1" ]; - externalInterface = "wlp170s0"; + settings = { + server = [ "8.8.8.8" "1.1.1.1" ]; + domain-needed = true; + bogus-priv = true; + no-resolv = true; + + cache-size = 1000; + + dhcp-range = [ "enp0s13f0u1,192.168.100.10,192.168.100.100" ]; + interface = "enp0s13f0u1"; + dhcp-host = "192.168.100.1"; + + local = "/lan/"; + domain = "lan"; + expand-hosts = true; + + no-hosts = true; + address = "/infini-framework.lan/192.168.100.1"; + }; }; - }; - services.dnsmasq = { - enable = true; - settings = { - server = [ "8.8.8.8" "1.1.1.1" ]; - domain-needed = true; - bogus-priv = true; - no-resolv = true; - - cache-size = 1000; - - dhcp-range = [ "enp0s13f0u1,192.168.100.10,192.168.100.100" ]; - interface = "enp0s13f0u1"; - dhcp-host = "192.168.100.1"; - - local = "/lan/"; - domain = "lan"; - expand-hosts = true; - - no-hosts = true; - address = "/infini-framework.lan/192.168.100.1"; + boot.kernel.sysctl = { + "net.ipv4.conf.all.forwarding" = true; + "net.ipv6.conf.all.forwarding" = true; }; - }; - boot.kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = true; - "net.ipv6.conf.all.forwarding" = true; }; }