From 0b55d0277cd341eed9532677036e885c0ae038ed Mon Sep 17 00:00:00 2001 From: ene Date: Sun, 19 Mar 2023 18:01:16 +0100 Subject: Refactor(system/hardware): Move hardware to host The hardware settings are (somewhat) host specific, and putting them in `system` just builds the wrong expectations. --- hosts/server1/configuration.nix | 1 + hosts/server1/hardware.nix | 9 +++++++++ system/default.nix | 1 - system/hardware/default.nix | 9 --------- 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 hosts/server1/hardware.nix delete mode 100644 system/hardware/default.nix diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix index ad3d8a3..891c5dc 100644 --- a/hosts/server1/configuration.nix +++ b/hosts/server1/configuration.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { imports = [ ./networking.nix # network configuration that just works + ./hardware.nix ../../system ]; diff --git a/hosts/server1/hardware.nix b/hosts/server1/hardware.nix new file mode 100644 index 0000000..9fabafe --- /dev/null +++ b/hosts/server1/hardware.nix @@ -0,0 +1,9 @@ +{modulesPath, ...}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + (modulesPath + "/profiles/headless.nix") + ]; + boot.loader.grub.device = "/dev/vda"; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; + boot.initrd.kernelModules = []; +} diff --git a/system/default.nix b/system/default.nix index 9aa5d9e..d67ada2 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,7 +1,6 @@ {config, ...}: { imports = [ ./file_system_layouts - ./hardware ./packages ./services ./users diff --git a/system/hardware/default.nix b/system/hardware/default.nix deleted file mode 100644 index 9fabafe..0000000 --- a/system/hardware/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{modulesPath, ...}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - (modulesPath + "/profiles/headless.nix") - ]; - boot.loader.grub.device = "/dev/vda"; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; - boot.initrd.kernelModules = []; -} -- cgit 1.4.1