From bbb0110a033c932c21f029ef35bbc4d623891a52 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sun, 18 Jun 2023 11:56:51 -0400
Subject: [PATCH] virtualization: Always use vmVariant

This works since we're no longer depending on a network of virtual
machines that use their own virtualization configurations.
---
 modules/default.nix        |  7 +------
 modules/virtualization.nix | 34 ++++++++++++++++++----------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index c742414..56497d5 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -11,11 +11,6 @@
     ./stylix.nix
     ./thunar.nix
     ./user.nix
+    ./virtualization.nix
   ];
-
-  virtualisation.vmVariant = {
-    imports = [
-      ./virtualization.nix
-    ];
-  };
 }
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
index 39bab97..7eefe9f 100644
--- a/modules/virtualization.nix
+++ b/modules/virtualization.nix
@@ -1,24 +1,26 @@
 {
-  virtualisation = {
-    memorySize = 8192;
-    cores = 4;
+  virtualisation.vmVariant = {
+    virtualisation = {
+      memorySize = 8192;
+      cores = 4;
 
-    sharedDirectories = {
-      testing = {
-        source = "/home/user/containers/testing";
-        target = "/mnt";
+      sharedDirectories = {
+        testing = {
+          source = "/home/user/containers/testing";
+          target = "/mnt";
+        };
       };
     };
-  };
 
-  virtualisation.qemu.options = [
-    "-device virtio-vga-gl"
-    "-display sdl,gl=on,show-cursor=off"
-    "-full-screen"
-    "-audio pa,model=hda"
-  ];
+    virtualisation.qemu.options = [
+      "-device virtio-vga-gl"
+      "-display sdl,gl=on,show-cursor=off"
+      "-full-screen"
+      "-audio pa,model=hda"
+    ];
 
-  environment.sessionVariables = {
-    WLR_NO_HARDWARE_CURSORS = "1";
+    environment.sessionVariables = {
+      WLR_NO_HARDWARE_CURSORS = "1";
+    };
   };
 }