diff --git a/infra/common/nixos/default.nix b/infra/common/nixos/default.nix index 20a77cb8..54b1dff3 100644 --- a/infra/common/nixos/default.nix +++ b/infra/common/nixos/default.nix @@ -8,7 +8,6 @@ in _class = "nixos"; imports = [ - ./hardware.nix ./networking.nix ./users.nix ]; diff --git a/infra/common/nixos/hardware.nix b/infra/common/proxmox-qemu-vm.nix similarity index 96% rename from infra/common/nixos/hardware.nix rename to infra/common/proxmox-qemu-vm.nix index 4b241e59..06d05e87 100644 --- a/infra/common/nixos/hardware.nix +++ b/infra/common/proxmox-qemu-vm.nix @@ -15,8 +15,6 @@ availableKernelModules = [ "ata_piix" "uhci_hcd" - "virtio_pci" - "virtio_scsi" "sd_mod" "sr_mod" ]; diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 1b55841c..9d2b246a 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -40,6 +40,7 @@ let ++ ( if isTestVm then [ + ./common/proxmox-qemu-vm.nix ../machines/operator/${vmName} { nixos.module.users.users.root.openssh.authorizedKeys.keys = [ diff --git a/machines/dev/fedi200/default.nix b/machines/dev/fedi200/default.nix index 23ba6de8..c92c8d52 100644 --- a/machines/dev/fedi200/default.nix +++ b/machines/dev/fedi200/default.nix @@ -16,4 +16,10 @@ gateway = "2a00:51c0:13:1305::1"; }; }; + + nixos.module = { + imports = [ + ../../../infra/common/proxmox-qemu-vm.nix + ]; + }; } diff --git a/machines/dev/fedi201/default.nix b/machines/dev/fedi201/default.nix index bb5058b8..00717597 100644 --- a/machines/dev/fedi201/default.nix +++ b/machines/dev/fedi201/default.nix @@ -19,6 +19,7 @@ nixos.module = { imports = [ + ../../../infra/common/proxmox-qemu-vm.nix ./fedipanel.nix ]; }; diff --git a/machines/dev/vm02116/default.nix b/machines/dev/vm02116/default.nix index e9338028..77253a7c 100644 --- a/machines/dev/vm02116/default.nix +++ b/machines/dev/vm02116/default.nix @@ -14,6 +14,7 @@ { lib, ... }: { imports = [ + ../../../infra/common/proxmox-qemu-vm.nix ./forgejo.nix ]; diff --git a/machines/dev/vm02187/default.nix b/machines/dev/vm02187/default.nix index 2f91d753..ab3e5d12 100644 --- a/machines/dev/vm02187/default.nix +++ b/machines/dev/vm02187/default.nix @@ -14,6 +14,7 @@ { lib, ... }: { imports = [ + ../../../infra/common/proxmox-qemu-vm.nix ./wiki.nix ];