diff --git a/machines/web-01/configuration.nix b/machines/web-01/configuration.nix index 7c14bb8..1187078 100644 --- a/machines/web-01/configuration.nix +++ b/machines/web-01/configuration.nix @@ -3,15 +3,10 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, lib, ... }: -let - sources = import ../../npins; -in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - (sources.disko + "/module.nix") - ./disko.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/machines/web-01/hardware-configuration.nix b/machines/web-01/hardware-configuration.nix index 33543ed..0cff5b2 100644 --- a/machines/web-01/hardware-configuration.nix +++ b/machines/web-01/hardware-configuration.nix @@ -4,8 +4,10 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + (let sources = import ../../npins; in sources.disko + "/module.nix") + ./disko.nix ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "ahci" "virtio_blk" ];