| 29 Jun 2025 |
hexa | * diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index d620e5e30fdf..01cb36fb99df 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -52,5 +52,13 @@
programs.git.enable = lib.mkDefault true;
+ # Provide networkmanager for easy wireless configuration.
+ networking.networkmanager = {
+ enable = true;
+ enableDefaultPlugins = false;
+ };
+ networking.modemmanager.enable = lib.mkForce false;
+ networking.wireless.enable = lib.mkImageMediaOverride false;
+
system.stateVersion = lib.mkDefault lib.trivial.release;
}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index f73617694961..37998c334e5f 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -20,10 +20,6 @@
services.xserver.enable = true;
- # Provide networkmanager for easy wireless configuration.
- networking.networkmanager.enable = true;
- networking.wireless.enable = lib.mkImageMediaOverride false;
-
# KDE complains if power management is disabled (to be precise, if
# there is no power management backend such as upower).
powerManagement.enable = true;
| 14:55:29 |
emily | the graphical ISO already has NM I presume | 14:55:38 |
hexa | it has, we're moving it into the base config from there | 14:55:51 |
emily | yeah | 14:55:56 |
emily | NM depends on ModemManager directly. I'm not sure we should omit it (because WWAN may be the only available connectivity) unless we can't reduce the closure size sufficiently without | 14:58:39 |
emily | I'm going to look at the nix-tree | 14:58:43 |
hexa | we're at +38MB with that diff | 14:59:03 |
emily | +249 MiB is from the nonsense openconnect VPN thing | 14:59:15 |
hexa | there's probably not much more that can be saved from that stack | 14:59:20 |
emily | I guess your diff disables that because of the plugins thing? | 14:59:29 |
hexa | yeah, hence enableDefaultPlugin = false | 14:59:29 |
hexa | * yeah, hence enableDefaultPlugins = false | 14:59:32 |
hexa | yes | 14:59:37 |
hexa |  Download image.png | 15:00:03 |
emily | right. that's going to scupper offline installs with minimal ISO | 15:00:12 |
emily | how about we yeet networkmanager-openconnect from there instead | 15:00:18 |
hexa | not going to get into that | 15:00:38 |
emily | would be good to figure out if "default" is a judgement we're making or NM upstream is making | 15:00:38 |
hexa | if these are default recommendations that's not my place | 15:00:46 |
hexa | yeah, I hoped this is upstream making it | 15:00:54 |
emily | I am not sure these are upstream recommendations. I am checking | 15:01:00 |
hexa | the nm module needs some love as well 😄 | 15:01:18 |
emily | so | 15:02:48 |
emily | apparently at least one of these plugins pulls in WebKitGTK | 15:02:54 |
emily | for captive portals | 15:02:55 |
hexa | yes, but no, but yes 🫠| 15:03:16 |
hexa | capitve portal support kinda important | 15:03:36 |
K900 | These are all the upstream developed plugins | 15:03:40 |
K900 | I think | 15:03:41 |
hexa | but not for the price of a webkitgtk | 15:03:42 |