diff --git a/infra/common/hardware.nix b/infra/common/hardware.nix index ae1b76a..d71fdc5 100644 --- a/infra/common/hardware.nix +++ b/infra/common/hardware.nix @@ -1,4 +1,8 @@ +{ modulesPath, ... }: + { + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; + boot = { loader = { systemd-boot.enable = true; @@ -9,6 +13,9 @@ availableKernelModules = [ "ata_piix" "uhci_hcd" + "virtio_pci" + "virtio_scsi" + "sd_mod" "sr_mod" "xen_blkfront" ]; diff --git a/infra/vm02179/configuration.nix b/infra/vm02179/configuration.nix index e38180b..59a5add 100644 --- a/infra/vm02179/configuration.nix +++ b/infra/vm02179/configuration.nix @@ -9,10 +9,6 @@ ip6 = "2a00:51c0:12:1201::179"; }; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - # Set your time zone. time.timeZone = "Europe/Amsterdam"; diff --git a/infra/vm02179/hardware-configuration.nix b/infra/vm02179/hardware-configuration.nix index 87f1d3d..36a2506 100644 --- a/infra/vm02179/hardware-configuration.nix +++ b/infra/vm02179/hardware-configuration.nix @@ -1,23 +1,6 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ lib, modulesPath, ... }: +{ lib, ... }: { - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - - boot.initrd.availableKernelModules = [ - "ata_piix" - "uhci_hcd" - "virtio_pci" - "virtio_scsi" - "sd_mod" - "sr_mod" - ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - fileSystems."/" = { device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241"; fsType = "ext4"; @@ -32,14 +15,7 @@ ]; }; - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; }