From a6aecc1cc2e493a7c2535a7f4d699ec79d5a7f68 Mon Sep 17 00:00:00 2001 From: Rory& Date: Mon, 13 Apr 2026 14:23:46 +0200 Subject: [PATCH] testvm: unwrap vmVariant settings --- nix/testVm/vm.nix | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/nix/testVm/vm.nix b/nix/testVm/vm.nix index 1b07ec580..1138e8b72 100644 --- a/nix/testVm/vm.nix +++ b/nix/testVm/vm.nix @@ -9,28 +9,26 @@ (modulesPath + "/virtualisation/qemu-vm.nix") ]; - virtualisation.vmVariant = { - services.xserver.videoDrivers = [ "qxl" ]; - services.spice-vdagentd.enable = true; - virtualisation.qemu.guestAgent.enable = true; - services.qemuGuest.enable = true; - virtualisation.qemu.options = [ - "-vga qxl -device virtio-serial-pci -spice port=5930,disable-ticketing=on -device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 -chardev spicevmc,id=spicechannel0,name=vdagent" - "-display gtk,zoom-to-fit=off,show-cursor=on" - "-device virtio-balloon" - ]; - virtualisation.memorySize = 8192; - virtualisation.cores = 10; - virtualisation.forwardPorts = [ - # { hostPort = 2222; guestPort = 22; } # Probably shouldn't do this with root:root lol - { - from = "host"; - host.port = 8080; - guest.port = 80; - } - ]; - networking.useDHCP = lib.mkForce true; - }; + services.xserver.videoDrivers = [ "qxl" ]; + services.spice-vdagentd.enable = true; + virtualisation.qemu.guestAgent.enable = true; + services.qemuGuest.enable = true; + virtualisation.qemu.options = [ + "-vga qxl -device virtio-serial-pci -spice port=5930,disable-ticketing=on -device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 -chardev spicevmc,id=spicechannel0,name=vdagent" + "-display gtk,zoom-to-fit=off,show-cursor=on" + "-device virtio-balloon" + ]; + virtualisation.memorySize = 8192; + virtualisation.cores = 10; + virtualisation.forwardPorts = [ + # { hostPort = 2222; guestPort = 22; } # Probably shouldn't do this with root:root lol + { + from = "host"; + host.port = 8080; + guest.port = 80; + } + ]; + networking.useDHCP = lib.mkForce true; networking.firewall.enable = false;