From 7e7cf1ce2fe2e5742db5ebea58cada7f16cc3d7d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 21 May 2025 22:43:59 -0400 Subject: [PATCH 1/2] nixos-generate-config: Add a flake default to the conf file --- nixos/modules/installer/tools/nixos-generate-config.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ae09839d071d..1038fadec37d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -49,6 +49,7 @@ if (-e "/etc/nixos-generate-config.conf") { $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path } $kernel = $cfg->val("Defaults", "Kernel") // $kernel; + $flake = $cfg->val("Defaults", "Flake") // $flake; } for (my $n = 0; $n < scalar @ARGV; $n++) { From d5960b9e0318c33ca2a4c44e7d2ff74587608011 Mon Sep 17 00:00:00 2001 From: gustavderdrache Date: Fri, 6 Jun 2025 10:45:28 -0400 Subject: [PATCH 2/2] nixos-generate-config: Add test for Flake=1 option --- nixos/tests/nixos-generate-config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix index c887403bbda3..175849bcac62 100644 --- a/nixos/tests/nixos-generate-config.nix +++ b/nixos/tests/nixos-generate-config.nix @@ -46,5 +46,11 @@ machine.succeed("rm -rf /etc/nixos") machine.succeed("nixos-generate-config --flake") machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix") + + machine.succeed("mv /etc/nixos /etc/nixos-with-flake-arg") + machine.succeed("printf '[Defaults]\nFlake = 1\n' > /etc/nixos-generate-config.conf") + machine.succeed("nixos-generate-config") + machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix") + machine.succeed("diff -r /etc/nixos /etc/nixos-with-flake-arg") ''; }