Merge pull request 'disable state-version in right place' (#5038) from private-flake-2 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5038
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
lib.mkIf config.clan.core.enableRecommendedDefaults {
|
||||
|
||||
# Enable automatic state-version generation.
|
||||
clan.core.settings.state-version.enable = true;
|
||||
clan.core.settings.state-version.enable = lib.mkDefault true;
|
||||
|
||||
# Use systemd during boot as well except:
|
||||
# - systems with raids as this currently require manual configuration: https://github.com/NixOS/nixpkgs/issues/210210
|
||||
|
||||
@@ -14,6 +14,8 @@ let
|
||||
self.nixosModules.installer
|
||||
];
|
||||
|
||||
# We don't need state-version in a live installer, we can just set nixos.release directly
|
||||
clan.core.settings.state-version.enable = false;
|
||||
system.stateVersion = config.system.nixos.release;
|
||||
nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.x86_64-linux;
|
||||
|
||||
|
||||
@@ -10,9 +10,6 @@
|
||||
clan-core.nixosModules.installer
|
||||
];
|
||||
|
||||
# We don't need state-version in a live installer
|
||||
clan.core.settings.state-version.enable = false;
|
||||
|
||||
clan.core.deployment.requireExplicitUpdate = true;
|
||||
|
||||
nixpkgs.pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
|
||||
|
||||
Reference in New Issue
Block a user