From f79bdeca5a6402de8a769bba9eca948e97d03781 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Fri, 24 May 2024 17:18:15 -0500 Subject: [PATCH] refactor(nix/hosts/orion): use real system os options --- hosts/orion/os/boot.nix | 22 ++++++---------------- hosts/orion/os/fs.nix | 2 -- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/hosts/orion/os/boot.nix b/hosts/orion/os/boot.nix index d8100779..f4733407 100644 --- a/hosts/orion/os/boot.nix +++ b/hosts/orion/os/boot.nix @@ -1,8 +1,7 @@ { modulesPath, pkgs, ... }: { - # imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { loader = { @@ -13,23 +12,14 @@ kernelParams = [ "audit=1" ]; extraModulePackages = [ ]; initrd = { - # VM modules availableKernelModules = [ - "ahci" "xhci_pci" - "virtio_pci" - "sr_mod" - "virtio_blk" + "thunderbolt" + "vmd" + "nvme" + "usbhid" + "rtsx_pci_sdmmc" ]; - # Actual Host modules - # availableKernelModules = [ - # "xhci_pci" - # "thunderbolt" - # "vmd" - # "nvme" - # "usbhid" - # "rtsx_pci_sdmmc" - # ]; systemd = { enable = true; initrdBin = [ diff --git a/hosts/orion/os/fs.nix b/hosts/orion/os/fs.nix index b4b8e9a4..5f2ab515 100644 --- a/hosts/orion/os/fs.nix +++ b/hosts/orion/os/fs.nix @@ -1,6 +1,4 @@ { - modulesPath, - config, lib, root-disk, persist-dir,