nixos/installer: enable networkmanager by default (#420923)

Changed files
+3 -28
nixos
modules
-25
nixos/modules/installer/tools/nixos-generate-config.pl
···
$fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n";
}
-
my $networkingDhcpConfig = generateNetworkingDhcpConfig();
-
my $hwConfig = <<EOF;
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
···
boot.kernelModules = [$kernelModules ];
boot.extraModulePackages = [$modulePackages ];
$fsAndSwap
-
$networkingDhcpConfig
${\join "", (map { " $_\n" } (uniq @attrs))}}
EOF
-
-
sub generateNetworkingDhcpConfig {
-
# FIXME disable networking.useDHCP by default when switching to networkd.
-
my $config = <<EOF;
-
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-
# (the default) this is the recommended approach. When using systemd-networkd it's
-
# still possible to use this option, but it's recommended to use it in conjunction
-
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-
networking.useDHCP = lib.mkDefault true;
-
EOF
-
-
foreach my $path (glob "/sys/class/net/*") {
-
my $dev = basename($path);
-
if ($dev ne "lo") {
-
$config .= " # networking.interfaces.$dev.useDHCP = lib.mkDefault true;\n";
-
}
-
}
-
-
return $config;
-
}
sub generateXserverConfig {
my $xserverEnabled = "@xserverEnabled@";
···
boot.kernelPackages = pkgs.linuxPackages_latest;
EOF
}
-
-
my $networkingDhcpConfig = generateNetworkingDhcpConfig();
my $xserverConfig = generateXserverConfig();
···
$fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n";
}
my $hwConfig = <<EOF;
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
···
boot.kernelModules = [$kernelModules ];
boot.extraModulePackages = [$modulePackages ];
$fsAndSwap
${\join "", (map { " $_\n" } (uniq @attrs))}}
EOF
sub generateXserverConfig {
my $xserverEnabled = "@xserverEnabled@";
···
boot.kernelPackages = pkgs.linuxPackages_latest;
EOF
}
my $xserverConfig = generateXserverConfig();
+3 -3
nixos/modules/installer/tools/tools.nix
···
$bootLoaderConfig
# networking.hostName = "nixos"; # Define your hostname.
-
# Pick only one of the below networking options.
-
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
-
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# Set your time zone.
# time.timeZone = "Europe/Amsterdam";
···
$bootLoaderConfig
# networking.hostName = "nixos"; # Define your hostname.
+
+
# Configure network connections interactively with nmcli or nmtui.
+
networking.networkmanager.enable = true;
# Set your time zone.
# time.timeZone = "Europe/Amsterdam";