Merge pull request #84 from naturallaw777/copilot/add-hardware-configuration-to-modules
Fix nixos-install: wire hardware-configuration.nix into flake and installer
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
modules = [
|
||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||
self.nixosModules.Sovran_SystemsOS
|
||||
/etc/nixos/hardware-configuration.nix
|
||||
/etc/nixos/role-state.nix
|
||||
/etc/nixos/custom.nix
|
||||
];
|
||||
|
||||
@@ -839,7 +839,6 @@ class InstallerWindow(Adw.ApplicationWindow):
|
||||
status = Adw.StatusPage()
|
||||
status.set_title("Drives Ready")
|
||||
status.set_description("Your drives have been partitioned successfully.")
|
||||
status.set_icon_name("emblem-ok-symbolic")
|
||||
status.set_vexpand(True)
|
||||
|
||||
details = Adw.PreferencesGroup()
|
||||
@@ -908,6 +907,7 @@ class InstallerWindow(Adw.ApplicationWindow):
|
||||
run(["sudo", "mkdir", "-p", "/etc/nixos"])
|
||||
run(["sudo", "cp", "/mnt/etc/nixos/role-state.nix", "/etc/nixos/role-state.nix"])
|
||||
run(["sudo", "cp", "/mnt/etc/nixos/custom.nix", "/etc/nixos/custom.nix"])
|
||||
run(["sudo", "cp", "/mnt/etc/nixos/hardware-configuration.nix", "/etc/nixos/hardware-configuration.nix"])
|
||||
|
||||
run_stream([
|
||||
"sudo", "nixos-install",
|
||||
|
||||
Reference in New Issue
Block a user