diff --git a/nixos/agares/network.nix b/nixos/agares/network.nix index cd6640f..16ae414 100644 --- a/nixos/agares/network.nix +++ b/nixos/agares/network.nix @@ -10,7 +10,7 @@ in enable = true; links = { "10-persistent" = { - matchConfig.OriginalName = [ "enp1s0" "enp2s0" ]; + matchConfig.OriginalName = [ "enp1s0" "enp2s0" ]; # takes search domains from the [Network] linkConfig.MACAddressPolicy = "persistent"; }; }; @@ -90,14 +90,18 @@ in } ]; dhcpServerConfig = { - DNS = "${ipv4Prefix}.${subnetId}.1"; - NTP = "${ipv4Prefix}.${subnetId}.1"; + DNS = "_server_address"; + NTP = "_server_address"; EmitDNS = true; EmitNTP = true; EmitRouter = true; PoolOffset = 100; PoolSize = 100; - SendOption = "12:string:${domain}"; + }; + ipv6SendRAConfig = { + EmitDNS = true; + DNS = "_link_local"; + EmitDomains = true; # takes search domains from the [Network] }; linkConfig = { RequiredForOnline = "no"; diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix index 3b0ef2d..d85cb18 100644 --- a/nixos/ninurta/configuration.nix +++ b/nixos/ninurta/configuration.nix @@ -279,14 +279,26 @@ in "10-lan" = { matchConfig.Name = "enp*"; networkConfig.DHCP = "ipv4"; + networkConfig.Domains = [ "bs.dadada.li" ]; networkConfig.VLAN = [ "backup" ]; networkConfig.IPv6PrivacyExtensions = false; linkConfig.RequiredForOnline = "routable"; + dhcpV4Config = { + UseDomains = true; + UseDNS = true; + UseNTP = true; + }; + ipv6AcceptRAConfig = { + UseDomains = true; + UseDNS = true; + }; }; "20-backup" = { matchConfig.Name = "backup"; - networkConfig.DHCP = "ipv4"; - networkConfig.IPv6PrivacyExtensions = false; + networkConfig = { + DHCP = "ipv4"; + IPv6PrivacyExtensions = false; + }; linkConfig.RequiredForOnline = false; }; "10-hydra" = {