diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index b6d9a80..7665843 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -238,51 +238,51 @@ in }; services.dnsmasq = { enable = true; - servers = ["::1#5354"]; - extraConfig = '' - interface=${netifLan} - interface=${netifWifi} - bind-interfaces - dhcp-range=interface:${netifLan},192.168.1.81,192.168.1.254,24h - dhcp-range=interface:${netifWifi},192.168.12.10,192.168.12.254,24h - enable-ra - dhcp-range=interface:${netifLan},::,constructor:${netifLan},ra-names - dhcp-range=interface:${netifWifi},::,constructor:${netifWifi},ra-only + settings = { + server = ["::1#5354"]; + interface = [ netifLan netifWifi ]; + bind-interfaces = true; + dhcp-range = [ + "interface:${netifLan},192.168.1.81,192.168.1.254,24h" + "interface:${netifWifi},192.168.12.10,192.168.12.254,24h" + "interface:${netifLan},::,constructor:${netifLan},ra-names" + "interface:${netifWifi},::,constructor:${netifWifi},ra-only" + ]; + enable-ra = true; - no-resolv + no-resolv = true; - # Static IPv4s to make Red Pitayas with factory firmware less annoying - dhcp-host=rp-f05cc9,192.168.1.190 - dhcp-host=rp-f0612e,192.168.1.191 - # Static IPv4s to make port redirections work - dhcp-host=rpi-1,192.168.1.201 - dhcp-host=rpi-2,192.168.1.202 - dhcp-host=rpi-3,192.168.1.203 - dhcp-host=rpi-4,192.168.1.204 + dhcp-host = [ + # Static IPv4s to make Red Pitayas with factory firmware less annoying + "rp-f05cc9,192.168.1.190" + "rp-f0612e,192.168.1.191" + # Static IPv4s to make port redirections work + "rpi-1,192.168.1.201" + "rpi-2,192.168.1.202" + "rpi-3,192.168.1.203" + "rpi-4,192.168.1.204" + ]; - # Static IP addresses for non-DHCP boards - address=/thermostat/192.168.1.26 - address=/powercycler/192.168.1.31 - address=/kc705/192.168.1.50 - address=/zynq-experiments/192.168.1.51 - address=/zc706/192.168.1.52 - address=/zc706-2/192.168.1.53 - address=/cora-z7/192.168.1.54 - address=/rust-pitaya/192.168.1.55 - address=/sayma/192.168.1.60 - address=/metlino/192.168.1.65 - address=/kasli/192.168.1.70 - address=/kasli-customer/192.168.1.75 - address=/stabilizer-customer/192.168.1.76 + address = [ + # Static IP addresses for non-DHCP boards + "/thermostat/192.168.1.26" + "/powercycler/192.168.1.31" + "/kc705/192.168.1.50" + "/zynq-experiments/192.168.1.51" + "/zc706/192.168.1.52" + "/zc706-2/192.168.1.53" + "/cora-z7/192.168.1.54" + "/rust-pitaya/192.168.1.55" + "/kasli/192.168.1.70" + "/kasli-customer/192.168.1.75" + "/stabilizer-customer/192.168.1.76" - # uTCA MCH from NAT - address=/tschernobyl/192.168.1.80 - - # Google can't do DNS geolocation correctly and slows down websites of everyone using - # their shitty font cloud hosting. In HK, you sometimes get IPs behind the GFW that you - # cannot reach. - address=/fonts.googleapis.com/142.250.207.74 - ''; + # Google can't do DNS geolocation correctly and slows down websites of everyone using + # their shitty font cloud hosting. In HK, you sometimes get IPs behind the GFW that you + # cannot reach. + "/fonts.googleapis.com/142.250.207.74" + ]; + }; }; # Select internationalisation properties.