From 31759dc4b74e667462b98b41e031fc2362d10428 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Sep 2021 20:16:18 +0300 Subject: [PATCH] nixos/networkmanager: remove redundant ipv6.ip6-privacy this setting was added in 2016 in commit bcdd81d9e14d960cf2fc910b622e236728a7fc07 the posibility to preferTempAddress was added to nixos/network-interface in 2018 in commit 1fec496f384c53df39684035bafb482865d3eff8 preferTempAddress was renamed to tempAddress in 2020 in commit 2485e6399e1737d9795f836bb057ab0daf719f03 therefore this setting is redundant since nm will use the sysctl option nixos/network-interfaces: add default to sysctl so that the value for it is set networkmanager falls back to it https://man.archlinux.org/man/NetworkManager.conf.5 --- nixos/modules/services/networking/networkmanager.nix | 1 - nixos/modules/tasks/network-interfaces.nix | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 74daf0ae9faf..73e63e2ee99b 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -527,7 +527,6 @@ in { { networkmanager.connectionConfig = { - "ipv6.ip6-privacy" = 2; "ethernet.cloned-mac-address" = cfg.ethernet.macAddress; "wifi.cloned-mac-address" = cfg.wifi.macAddress; "wifi.powersave" = diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 4e20ec118464..75fc5a14a800 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1233,6 +1233,8 @@ in "net.ipv4.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces); "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6); + # networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr" + "net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl; } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces) (i: [(nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true)])) // listToAttrs (forEach interfaces