From 9d96327ba5bbaef8542f526fbed086ab432c3a37 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Thu, 12 Dec 2024 14:13:29 -0600
Subject: [PATCH] utilize nixvirt

---
 flake.lock                     |  22 ++++
 flake.nix                      |   6 +
 hosts/othalan/default.nix      |   1 +
 hosts/othalan/virt.nix         |  27 -----
 hosts/othalan/virt/default.nix |  48 ++++++++
 hosts/othalan/virt/win11.xml   | 215 +++++++++++++++++++++++++++++++++
 lib/generators.nix             |   1 -
 7 files changed, 292 insertions(+), 28 deletions(-)
 delete mode 100644 hosts/othalan/virt.nix
 create mode 100644 hosts/othalan/virt/default.nix
 create mode 100644 hosts/othalan/virt/win11.xml

diff --git a/flake.lock b/flake.lock
index da7e835..6190cf6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "NixVirt": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732406038,
+        "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=",
+        "owner": "AshleyYakeley",
+        "repo": "NixVirt",
+        "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AshleyYakeley",
+        "repo": "NixVirt",
+        "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
+        "type": "github"
+      }
+    },
     "aquamarine": {
       "inputs": {
         "hyprutils": [
@@ -942,6 +963,7 @@
     },
     "root": {
       "inputs": {
+        "NixVirt": "NixVirt",
         "comin": "comin",
         "f1multiviewer": "f1multiviewer",
         "ghostty": "ghostty",
diff --git a/flake.nix b/flake.nix
index ef04605..81343d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,6 +83,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    NixVirt = {
+      # master as of 2024.12.12
+      url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # roc = {
     #   url = "github:roc-lang/roc";
     #   inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix
index 039ab2c..f6df1ba 100644
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@@ -6,6 +6,7 @@
   ...
 }:
 {
+
   oizys =
     {
       nix-ld = enabled // {
diff --git a/hosts/othalan/virt.nix b/hosts/othalan/virt.nix
deleted file mode 100644
index a501b66..0000000
--- a/hosts/othalan/virt.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  pkgs,
-  enabled,
-  ...
-}:
-{
-  programs.virt-manager = enabled;
-
-  virtualisation = {
-    libvirtd = enabled // {
-      # Enable TPM emulation (optional)
-      qemu = {
-        swtpm = enabled;
-        ovmf.packages = [ pkgs.OVMFFull.fd ];
-        vhostUserPackages = [ pkgs.virtiofsd ];
-      };
-
-    };
-
-    # Enable USB redirection (optional)
-    spiceUSBRedirection = enabled;
-  };
-
-  users.users.daylin = {
-    extraGroups = [ "libvirtd" ];
-  };
-}
diff --git a/hosts/othalan/virt/default.nix b/hosts/othalan/virt/default.nix
new file mode 100644
index 0000000..a940532
--- /dev/null
+++ b/hosts/othalan/virt/default.nix
@@ -0,0 +1,48 @@
+{
+  inputs,
+  pkgs,
+  flake,
+  enabled,
+  ...
+}:
+let
+  inherit (inputs) NixVirt;
+  defaultNetwork = {
+    definition = NixVirt.lib.network.writeXML (
+      NixVirt.lib.network.templates.bridge {
+        uuid = "e7955c23-8750-4405-ab2c-37aeee441f67";
+        subnet_byte = 24;
+      }
+    );
+  };
+in
+{
+  imports = [
+    (flake.module "NixVirt")
+  ];
+
+  programs.virt-manager = enabled;
+
+  virtualisation = {
+    libvirt = enabled // {
+      swtpm = enabled;
+      connections."qemu:///system" = {
+        networks = [ defaultNetwork ];
+        domains = [
+          { definition = ./win11.xml; }
+        ];
+      };
+    };
+    libvirtd.qemu = {
+      # ovmf.packages = [ pkgs.OVMFFull.fd ];
+      vhostUserPackages = [ pkgs.virtiofsd ];
+    };
+
+    # Enable USB redirection (optional)
+    spiceUSBRedirection = enabled;
+  };
+
+  users.users.daylin = {
+    extraGroups = [ "libvirtd" ];
+  };
+}
diff --git a/hosts/othalan/virt/win11.xml b/hosts/othalan/virt/win11.xml
new file mode 100644
index 0000000..24e901b
--- /dev/null
+++ b/hosts/othalan/virt/win11.xml
@@ -0,0 +1,215 @@
+<domain type='kvm'>
+  <name>win11</name>
+  <uuid>696578df-2a3d-4c40-814d-8d126a5699cd</uuid>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://microsoft.com/win/11"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory unit='KiB'>16777216</memory>
+  <currentMemory unit='KiB'>16777216</currentMemory>
+  <memoryBacking>
+    <source type='memfd'/>
+    <access mode='shared'/>
+  </memoryBacking>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-q35-9.1'>hvm</type>
+    <loader readonly='yes' type='pflash'>/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
+    <nvram template='/run/libvirt/nix-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/win11_VARS.fd</nvram>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <hyperv mode='custom'>
+      <relaxed state='on'/>
+      <vapic state='on'/>
+      <spinlocks state='on' retries='8191'/>
+      <vpindex state='on'/>
+      <runtime state='on'/>
+      <synic state='on'/>
+      <stimer state='on'/>
+      <frequencies state='on'/>
+      <tlbflush state='on'/>
+      <ipi state='on'/>
+      <evmcs state='on'/>
+      <avic state='on'/>
+    </hyperv>
+    <vmport state='off'/>
+  </features>
+  <cpu mode='host-passthrough' check='none' migratable='on'>
+    <topology sockets='1' dies='1' clusters='1' cores='4' threads='1'/>
+  </cpu>
+  <clock offset='localtime'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+    <timer name='hypervclock' present='yes'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/run/libvirt/nix-emulators/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' discard='unmap'/>
+      <source file='/home/daylin/vm/images/win11.qcow2'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/daylin/vm/isos/Win11_24H2_English_x64.iso'/>
+      <target dev='sdb' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/home/daylin/vm/isos/virtio-win-0.1.266.iso'/>
+      <target dev='sdc' bus='sata'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
+    </disk>
+    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
+      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='pci' index='1' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='1' port='0x10'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='2' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='2' port='0x11'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+    </controller>
+    <controller type='pci' index='3' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='3' port='0x12'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+    </controller>
+    <controller type='pci' index='4' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='4' port='0x13'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+    </controller>
+    <controller type='pci' index='5' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='5' port='0x14'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+    </controller>
+    <controller type='pci' index='6' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='6' port='0x15'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+    </controller>
+    <controller type='pci' index='7' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='7' port='0x16'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
+    </controller>
+    <controller type='pci' index='8' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='8' port='0x17'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
+    </controller>
+    <controller type='pci' index='9' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='9' port='0x18'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
+    </controller>
+    <controller type='pci' index='10' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='10' port='0x19'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
+    </controller>
+    <controller type='pci' index='11' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='11' port='0x1a'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
+    </controller>
+    <controller type='pci' index='12' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='12' port='0x1b'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
+    </controller>
+    <controller type='pci' index='13' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='13' port='0x1c'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
+    </controller>
+    <controller type='pci' index='14' model='pcie-root-port'>
+      <model name='pcie-root-port'/>
+      <target chassis='14' port='0x1d'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
+    </controller>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+    </controller>
+    <filesystem type='mount' accessmode='passthrough'>
+      <driver type='virtiofs' queue='1024'/>
+      <source dir='/home/daylin/vm/viofs'/>
+      <target dir='shared'/>
+      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+    </filesystem>
+    <interface type='network'>
+      <mac address='52:54:00:cd:cd:18'/>
+      <source network='default'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
+    <input type='tablet' bus='usb'>
+      <address type='usb' bus='0' port='1'/>
+    </input>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <tpm model='tpm-crb'>
+      <backend type='emulator' version='2.0'/>
+    </tpm>
+    <graphics type='spice' autoport='yes'>
+      <listen type='address'/>
+      <image compression='off'/>
+    </graphics>
+    <sound model='ich9'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
+    </sound>
+    <audio id='1' type='spice'/>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
+    </video>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='2'/>
+    </redirdev>
+    <redirdev bus='usb' type='spicevmc'>
+      <address type='usb' bus='0' port='3'/>
+    </redirdev>
+    <watchdog model='itco' action='reset'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
+
diff --git a/lib/generators.nix b/lib/generators.nix
index cc6b79f..a06f750 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -20,7 +20,6 @@ let
   flake = flakeFromSystem "x86_64-linux";
   hostPath = host: ../. + "/hosts/${host}";
 
-  # all nix files not including pkgs.nix
   hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile;
 
   nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);