1 files changed, 111 insertions, 7 deletions

diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
index 4e5a9b90..86df9678 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -3,24 +3,31 @@
 with lib;
 with flakeInputs.nixVirt.lib;
 
-{
+let
+  libosinfo = id: with xml;
+    elem "libosinfo:libosinfo" [ (attr "xmlns:libosinfo" "http://libosinfo.org/xmlns/libvirt/domain/1.0") ]
+      [
+        (elem "libosinfo:os" [ (attr "id" id) ] [])
+      ];
+in {
   config = {
     virtualisation.libvirt = {
       enable = true;
       swtpm.enable = true;
       connections."qemu:///session" = {
         domains = [
-          { definition = domain.writeXML (updateManyAttrsByPath [
-            ] (recursiveUpdate (domain.templates.windows {
+          { definition = domain.writeXML (recursiveUpdate (domain.templates.windows {
               name = "lmmirzm-vmrz01";
               uuid = "9e1dab2e-7986-4cb3-88af-6fad8969e15f";
               memory = { count = 16; unit = "GiB"; };
               storage_vol = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
               nvram_path = "/home/gkleen/.local/share/libvirt/lmmirzm-vmrz01.nvram";
-              virtio_drive = true;
               virtio_video = true;
               install_virtio = false;
             }) {
+              metadata = [
+                (libosinfo "http://microsoft.com/win/11")
+              ];
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -39,7 +46,6 @@ with flakeInputs.nixVirt.lib;
               devices.video.model.acceleration.accel3d = false;
               devices.interface = {
                 model.type = "virtio";
-                # model.type = "e1000e";
                 type = "bridge";
                 mac.address = "52:54:00:b9:f3:ed";
                 source.bridge = "rz-0971";
@@ -60,7 +66,7 @@ with flakeInputs.nixVirt.lib;
                 }
               ];
               devices.tpm.model = "tpm-tis";
-            }));
+            });
           }
           { definition = domain.writeXML (recursiveUpdate (domain.templates.linux {
               name = "vmrz02";
@@ -74,6 +80,7 @@ with flakeInputs.nixVirt.lib;
                   {
                     readonly = true;
                     type = "pflash";
+                    secure = false;
                     path = "${pkgs.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
                   };
                 nvram =
@@ -83,6 +90,9 @@ with flakeInputs.nixVirt.lib;
                   };
                 bootmenu.enable = true;
               };
+              metadata = [
+                (libosinfo "http://ubuntu.com/ubuntu/20.04")
+              ];
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -137,6 +147,86 @@ with flakeInputs.nixVirt.lib;
               };
             });
           }
+          { definition = domain.writeXML (recursiveUpdate (domain.templates.linux {
+              name = "vmrz03";
+              uuid = "1250a47c-3199-478d-8cf3-ea4a64c0567a";
+              memory = { count = 8; unit = "GiB"; };
+              storage_vol = "/home/gkleen/.local/share/libvirt/images/vmrz03.qcow2";
+              virtio_video = true;
+            }) {
+              os = {
+                loader =
+                  {
+                    readonly = true;
+                    type = "pflash";
+                    secure = false;
+                    path = "${pkgs.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
+                  };
+                nvram =
+                  {
+                    template = "${pkgs.OVMFFull.fd}/FV/OVMF_VARS.ms.fd";
+                    path = "/home/gkleen/.local/share/libvirt/vmrz03.nvram";
+                  };
+                bootmenu.enable = true;
+              };
+              metadata = [
+                (libosinfo "http://ubuntu.com/ubuntu/24.04")
+              ];
+              qemu-commandline.env = [
+                { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
+              ];
+              vcpu.count = 4;
+              cpu = {
+                mode = "host-model";
+                feature = [
+                  { name = "vmx"; policy = "require"; }
+                ];
+              };
+              devices.graphics = {
+                listen.type = "address";
+                gl.enable = false;
+              };
+              devices.video.model.acceleration.accel3d = false;
+              devices.interface = [
+                {
+                  model.type = "virtio";
+                  type = "bridge";
+                  mac.address = "52:54:00:a1:f7:8a";
+                  source.bridge = "rz-0971";
+                }
+                {
+                  model.type = "virtio";
+                  type = "bridge";
+                  mac.address = "52:54:00:8d:d3:0b";
+                  source.bridge = "rz-2403";
+                  link.state = "down";
+                }
+              ];
+              devices.channel = [
+                {
+                  type = "unix";
+                  target = { type = "virtio"; name = "org.qemu.guest_agent.0"; };
+                }
+                {
+                  type = "spicevmc";
+                  target = { type = "virtio"; name = "com.redhat.spice.0"; };
+                }
+                {
+                  type = "spiceport";
+                  target = { type = "virtio"; name = "org.spice-space.webdav.0"; };
+                  source.channel = "org.spice-space.webdav.0";
+                }
+              ];
+              devices.tpm = {
+                model = "tpm-tis";
+                backend =
+                  {
+                    type = "emulator";
+                    version = "2.0";
+                  };
+              };
+            });
+          }
         ];
         pools = [
           { definition = pool.writeXML {
@@ -152,7 +242,8 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "lmmirzm-vmrz01.qcow2";
-                  capacity = { count = 40; unit = "GB"; };
+                  allocation = { count = 0; };
+                  capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
                     format.type = "qcow2";
@@ -163,6 +254,7 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "vmrz02.qcow2";
+                  allocation = { count = 0; };
                   capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/vmrz02.qcow2";
@@ -171,6 +263,18 @@ with flakeInputs.nixVirt.lib;
                   };
                 };
               }
+              { definition = volume.writeXML {
+                  type = "file";
+                  name = "vmrz03.qcow2";
+                  allocation = { count = 0; };
+                  capacity = { count = 256; unit = "GB"; };
+                  target = {
+                    path = "/home/gkleen/.local/share/libvirt/images/vmrz03.qcow2";
+                    format.type = "qcow2";
+                    features.lazy_refcounts = {};
+                  };
+                };
+              }
             ];
           }
         ];