Skip to content

Also apply --system-config to diskoSystem #1241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abel465 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −13
Open

Also apply --system-config to diskoSystem #1241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions install-cli.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ let
originalSystem = (builtins.getFlake "${flake}").nixosConfigurations."${flakeAttr}";
lib = originalSystem.pkgs.lib;

# Apply extraSystemConfig first, before accessing any config values
baseSystem = originalSystem.extendModules {
modules = [
({ _file = "disko-install --system-config"; } // (builtins.fromJSON extraSystemConfig))
];
};

deviceName =
name:
if diskMappings ? ${name} then
Expand All @@ -29,12 +36,12 @@ let
device = dev;
};
}
) originalSystem.config.disko.devices.disk;
) baseSystem.config.disko.devices.disk;

# filter all nixos module internal attributes
cleanedDisks = lib.filterAttrsRecursive (n: _: !lib.hasPrefix "_" n) modifiedDisks;

diskoSystem = originalSystem.extendModules {
diskoSystem = baseSystem.extendModules {
modules = [
{
disko.rootMountPoint = rootMountPoint;
Expand All @@ -43,18 +50,12 @@ let
];
};

installSystem = originalSystem.extendModules {
installSystem = baseSystem.extendModules {
modules = [
(
{ lib, ... }:
{
boot.loader.efi.canTouchEfiVariables = lib.mkVMOverride writeEfiBootEntries;
boot.loader.grub.devices = lib.mkVMOverride (lib.attrValues diskMappings);
imports = [
({ _file = "disko-install --system-config"; } // (builtins.fromJSON extraSystemConfig))
];
}
)
{
boot.loader.efi.canTouchEfiVariables = lib.mkVMOverride writeEfiBootEntries;
boot.loader.grub.devices = lib.mkVMOverride (lib.attrValues diskMappings);
}
];
};
in
Expand Down
Loading