From 65a973951dcbfee5be9618c469ab13e63237864b Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Fri, 29 Aug 2025 14:15:38 -0400 Subject: [PATCH 1/2] nixos/networkmanager: fix serializing an invalid `wifi.powersave=null` NetworkManager does not define `null` as a valid value for `wifi.powersave`, and while strangely it doesn't seem to report any errors upon encountering it, it's a weird value and shouldn't be here. This is actually very similar to how the module used to work before the refactor in https://github.com/NixOS/nixpkgs/pull/118308 (see this [snippet](https://github.com/NixOS/nixpkgs/pull/118308/files#diff-0a708e7b053cf5df7620b5262936553af2242d2ce9dabde5bbeba221ece0a021L45-L46) from the PR changes). --- nixos/modules/services/networking/networkmanager.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 35d8f370eae9..78ae5d5424af 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -684,13 +684,7 @@ in networkmanager.connectionConfig = { "ethernet.cloned-mac-address" = cfg.ethernet.macAddress; "wifi.cloned-mac-address" = cfg.wifi.macAddress; - "wifi.powersave" = - if cfg.wifi.powersave == null then - null - else if cfg.wifi.powersave then - 3 - else - 2; + "wifi.powersave" = lib.mkIf (cfg.wifi.powersave != null) (if cfg.wifi.powersave then 3 else 2); }; } ]; From 93d55d06c8f2a57fa1d413ee31450e19e5545451 Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Fri, 29 Aug 2025 15:08:07 -0400 Subject: [PATCH 2/2] nixos/networkmanager: add frontear as maintainer --- nixos/modules/services/networking/networkmanager.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 78ae5d5424af..b6253a129e80 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -144,7 +144,9 @@ in { meta = { - maintainers = teams.freedesktop.members; + maintainers = teams.freedesktop.members ++ [ + lib.maintainers.frontear + ]; }; ###### interface