Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #84 from naturallaw777/copilot/add-hardware-configuration-to-modules

Browse Source 
Fix nixos-install: wire hardware-configuration.nix into flake and installer
This commit is contained in:
Sovran_Systems
2026-04-05 12:51:00 -05:00
committed by GitHub
parent f294828409 70f3cef03a
commit 6bd11be8b5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@@ -25,6 +25,7 @@
modules = [ modules = [
{ nixpkgs.hostPlatform = "x86_64-linux"; } { nixpkgs.hostPlatform = "x86_64-linux"; }
self.nixosModules.Sovran_SystemsOS self.nixosModules.Sovran_SystemsOS
/etc/nixos/hardware-configuration.nix
/etc/nixos/role-state.nix /etc/nixos/role-state.nix
/etc/nixos/custom.nix /etc/nixos/custom.nix
]; ];

2
iso/installer.py
View File

@@ -839,7 +839,6 @@ class InstallerWindow(Adw.ApplicationWindow):
status = Adw.StatusPage() status = Adw.StatusPage()
status.set_title("Drives Ready") status.set_title("Drives Ready")
status.set_description("Your drives have been partitioned successfully.") status.set_description("Your drives have been partitioned successfully.")
status.set_icon_name("emblem-ok-symbolic")
status.set_vexpand(True) status.set_vexpand(True)
details = Adw.PreferencesGroup() details = Adw.PreferencesGroup()
@@ -908,6 +907,7 @@ class InstallerWindow(Adw.ApplicationWindow):
run(["sudo", "mkdir", "-p", "/etc/nixos"]) 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/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/custom.nix", "/etc/nixos/custom.nix"])
run(["sudo", "cp", "/mnt/etc/nixos/hardware-configuration.nix", "/etc/nixos/hardware-configuration.nix"])
run_stream([ run_stream([
"sudo", "nixos-install", "sudo", "nixos-install",