meta: Merge virtualization with system

The check VMs still work as expected with this change.
This commit is contained in:
Donovan Glover 2024-04-05 19:38:56 -04:00
parent 51273df2c8
commit 2f30ce241b
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 23 additions and 26 deletions

View File

@ -1,7 +1,7 @@
{ nix-config, pkgs, lib, config, ... }:
let
inherit (lib) mkOption mkEnableOption mkIf;
inherit (lib) mkOption mkEnableOption;
inherit (lib.types) str listOf;
inherit (pkgs.nixVersions) nix_2_19;
inherit (cfg) username iHaveLotsOfRam;
@ -120,5 +120,27 @@ in
homeDirectory = "/home/${username}";
};
};
virtualisation.vmVariant = {
virtualisation = {
memorySize = 4096;
cores = 4;
qemu.options = [
"-device virtio-vga-gl"
"-display sdl,gl=on,show-cursor=off"
"-audio pa,model=hda"
];
};
environment.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
};
services.interception-tools.enable = lib.mkForce false;
networking.resolvconf.enable = lib.mkForce true;
boot.enableContainers = false;
};
};
}

View File

@ -1,25 +0,0 @@
{ lib, ... }:
{
virtualisation.vmVariant = {
virtualisation = {
memorySize = 4096;
cores = 4;
};
virtualisation.qemu.options = [
"-device virtio-vga-gl"
"-display sdl,gl=on,show-cursor=off"
"-audio pa,model=hda"
];
environment.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
};
services.interception-tools.enable = lib.mkForce false;
networking.resolvconf.enable = lib.mkForce true;
boot.enableContainers = false;
};
}