networkmanager: fix eval error when not enabled

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/19c30e016f04874d60ed0922bf58be4aa9a15e53' (2024-04-27)
  → 'github:nixos/nixpkgs/0e395f4da1693e39239ffac7abf73a0a6931c961' (2024-04-28)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/77759bd39047f1b92f12b26b55029f0cc2c88093' (2024-04-27)
  → 'github:nixos/nixpkgs/93909e9c7b05634ad924ff97c259ae0859b81756' (2024-04-28)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/ff41a88e80aaf3ae1561cc6a54636fc46f9214de' (2024-04-27)
  → 'github:nix-community/nixpkgs-wayland/4e58e2cf22d11426ed2f997551f3650de0639e3a' (2024-04-28)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/3b32a98eb3053f8c8ca55497d1881443ef2996e6' (2024-04-21)
  → 'github:nix-community/lib-aggregate/49d9b510614b9bd137e067eb31445a8feca83313' (2024-04-28)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/6882347415e352cfc9c277cc01f73e0f5cb7b93c' (2024-04-21)
  → 'github:nix-community/nixpkgs.lib/ade4fb7bbf04cd52bc1705734d5dc67755d77ec9' (2024-04-28)
```

flake.lock

@@ -61,11 +61,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1713701427,
-        "narHash": "sha256-v6z8hz/UDaC/rbnkH+hxGFUxlNyseVntRetVpSxLU6c=",
+        "lastModified": 1714306226,
+        "narHash": "sha256-CA7bfnDt9TcFc7I8eKHf72DodYUEETDPgmBFXBRP9/E=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "3b32a98eb3053f8c8ca55497d1881443ef2996e6",
+        "rev": "49d9b510614b9bd137e067eb31445a8feca83313",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1713660444,
-        "narHash": "sha256-2bVnrEGyWJhRNKspzfTJmVD/fsH9HQURD4cWpz79Ulw=",
+        "lastModified": 1714265296,
+        "narHash": "sha256-jVnKiCOoFulPT1zDdA4jfG/lnEnngdth5CT6rVDXEJ4=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "6882347415e352cfc9c277cc01f73e0f5cb7b93c",
+        "rev": "ade4fb7bbf04cd52bc1705734d5dc67755d77ec9",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1714206764,
-        "narHash": "sha256-vrFcPzhqap6XUfqA/FkNiUW12fjFis8PHlqx1AX3Q5c=",
+        "lastModified": 1714284059,
+        "narHash": "sha256-j+pzNbMlfK1rPHpgsMxeoKWhYQijBRSKazM2WJv1048=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "19c30e016f04874d60ed0922bf58be4aa9a15e53",
+        "rev": "0e395f4da1693e39239ffac7abf73a0a6931c961",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1714233728,
-        "narHash": "sha256-xq+NBStMeZH8Z7ndUnOF71b9PAu2j+rZcMrFXEq0wSU=",
+        "lastModified": 1714316994,
+        "narHash": "sha256-R1pZrEs0d6Ppdf7HWWXACUJRszvHeeJ4aAmS06jQz4k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "77759bd39047f1b92f12b26b55029f0cc2c88093",
+        "rev": "93909e9c7b05634ad924ff97c259ae0859b81756",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714230891,
-        "narHash": "sha256-VcSgHRMG/HfSyW0STt14UwEdTpOXDKX9oLMcGbmXoGw=",
+        "lastModified": 1714314982,
+        "narHash": "sha256-xgDMwBI+2b6XuJJdv2z/kNAURB+dkIpvTosjnS4FSFE=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "ff41a88e80aaf3ae1561cc6a54636fc46f9214de",
+        "rev": "4e58e2cf22d11426ed2f997551f3650de0639e3a",
         "type": "github"
       },
       "original": {

hosts/common/programs/networkmanager.nix

@@ -30,32 +30,34 @@ in
     wantedBy = [ "network-online.target" ];
   };
 
-  environment.etc."NetworkManager/NetworkManager.conf".text = lib.mkIf cfg.enabled ''
-    # TODO: much of this is likely not needed.
-    [connection]
-    ethernet.cloned-mac-address=preserve
-    wifi.cloned-mac-address=preserve
-    wifi.powersave=null
+  environment.etc = lib.mkIf cfg.enabled {
+    "NetworkManager/NetworkManager.conf".text = ''
+      # TODO: much of this is likely not needed.
+      [connection]
+      ethernet.cloned-mac-address=preserve
+      wifi.cloned-mac-address=preserve
+      wifi.powersave=null
 
-    [device]
-    wifi.backend=wpa_supplicant
-    wifi.scan-rand-mac-address=true
+      [device]
+      wifi.backend=wpa_supplicant
+      wifi.scan-rand-mac-address=true
 
-    [keyfile]
-    # keyfile.path: where to check for connection credentials
-    path=/var/lib/NetworkManager/system-connections
-    unmanaged-devices=null
+      [keyfile]
+      # keyfile.path: where to check for connection credentials
+      path=/var/lib/NetworkManager/system-connections
+      unmanaged-devices=null
 
-    [logging]
-    audit=false
-    level=WARN
+      [logging]
+      audit=false
+      level=WARN
 
-    [main]
-    dhcp=internal
-    dns=systemd-resolved
-    plugins=keyfile
-    rc-manager=unmanaged
-  '';
+      [main]
+      dhcp=internal
+      dns=systemd-resolved
+      plugins=keyfile
+      rc-manager=unmanaged
+    '';
+  };
   hardware.wirelessRegulatoryDatabase = lib.mkIf cfg.enabled true;
   networking.useDHCP = lib.mkIf cfg.enabled false;
   users.groups = lib.mkIf cfg.enabled {

nixpatches/list.nix

@@ -33,12 +33,6 @@ in [
   # and can be found with `nix-repl  > :lf .  > lastModifiedDate`
 
   # branch: wip-ffado-cross
-  (fetchpatch' {
-    title = "dbus_cplusplus: support cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/307420";
-    saneCommit = "f59a0e42ece4a1f9af4be3bd09e488b970670207";
-    hash = "sha256-sMfLKzKVb+gyTUkeVP3irPu6YYk+TGFei6kxoZnujfE=";
-  })
   (fetchpatch' {
     # TODO: send out for review (after jtolnar's stuff is merged)
     title = "ffado: support cross compilation";
@@ -54,13 +48,6 @@ in [
     hash = "sha256-53X4ssdp02C8NOUL5mlbhR7qwE9/KWp6iLmz1ljJopE=";
   })
 
-  (fetchpatch' {
-    title = "libjxl: fix cross compilation by only conditionally enabling plugins";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/306127";
-    saneCommit = "044b3342d1500fb2b741e87e4d10894f4d8fd716";
-    hash = "sha256-1DHw9AZSRlCkVq2ZullKPHAAHKIbuj5H0TL1l5OgEkE=";
-  })
-
   (fetchpatch' {
     title = "sway/hyprland: cross compilation fixes";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/292415";