4 files changed, 56 insertions, 47 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 5bdd1651..189fabfa 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -698,16 +698,16 @@ in {
         packages = with pkgs; [
           fira fira-code powerline-fonts nerdfonts pwvucontrol
           wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl
-          pamixer libnotify screen-message wrappedYTMDesktop qt5ct
-          playerctl evince thunderbird zoom-us steam steam-run
-          wireshark virt-manager rclone cached-nix-shell worktime
-          fira-code-symbols libreoffice xournalpp google-chrome
-          nixos-shell virt-viewer freerdp gnome-icon-theme
-          paper-icon-theme sshpassSecret weechat element-desktop
-          matrix-synapse-tools.synadm
+          pamixer libnotify screen-message wrappedYTMDesktop
+          libsForQt5.qt5ct playerctl evince thunderbird zoom-us steam
+          steam-run wireshark virt-manager rclone cached-nix-shell
+          worktime fira-code-symbols libreoffice xournalpp
+          google-chrome nixos-shell virt-viewer freerdp
+          gnome-icon-theme paper-icon-theme sshpassSecret weechat
+          element-desktop matrix-synapse-tools.synadm
           flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
           sieve-connect gimp inkscape udiskie glab nitrokey-app
-          pynitrokey gtklock wlrctl remmina openscad
+          pynitrokey gtklock wlrctl remmina openscad spice-record
         ];
 
         file = {
@@ -886,6 +886,24 @@ in {
             StartupWMClass = "Element";
           };
         };
+        rainbow = {
+          name = "Rainbow";
+          exec = toString (pkgs.writeShellScript "rainbow" ''
+            exec -- \
+              ${config.systemd.package}/bin/systemd-run --wait --user --slice-inherit \
+              --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
+              --property 'Environment=DSCP=46' \
+              -- ${pkgs.dscp}/bin/dscp ${pkgs.google-chrome}/bin/google-chrome-stable \
+              --force-device-scale-factor=1.5 \
+              --class=Rainbow \
+              --kiosk "https://web.openrainbow.com" \
+              --user-data-dir=''${HOME}/.config/google-chrome-rainbow
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
+            hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU=";
+          };
+        };
       };
 
       fonts = {
diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
index 54d971c4..076a0d86 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -15,11 +15,13 @@ with flakeInputs.nixVirt.lib;
               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_net = true;
               virtio_drive = true;
               virtio_video = false;
-              install_virtio = true;
+              install_virtio = false;
             }) {
+              qemu-commandline.env = [
+                { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
+              ];
               vcpu.count = 4;
               os.bootmenu.enable = true;
               devices.graphics = {
@@ -27,18 +29,42 @@ with flakeInputs.nixVirt.lib;
                 # gl.enable = true;
               };
               devices.interface = {
+                model.type = "virtio";
                 type = "bridge";
                 mac.address = "52:54:00:b9:f3:ed";
                 source.bridge = "gre-0971";
               };
+              devices.channel = [
+                {
+                  type = "unix";
+                  target = { type = "virtio"; name = "org.qemu.guest_agent.0"; };
+                }
+              ];
+              devices.tpm.model = "tpm-tis";
             });
           }
         ];
         pools = [
-          { definition = ./pool-default.xml;
+          { definition = pool.writeXML {
+              type = "dir";
+              name = "default";
+              uuid = "ad899c92-02e3-45f9-bf49-195467aba2e2";
+              target = {
+                path = "/home/gkleen/.local/share/libvirt/images";
+              };
+            };
             active = true;
             volumes = [
-              { definition = ./vol-lmmirzm-vmrz01.xml;
+              { definition = volume.writeXML {
+                  type = "file";
+                  name = "lmmirzm-vmrz01.qcow2";
+                  capacity = { count = 40; unit = "GB"; };
+                  target = {
+                    path = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
+                    format.type = "qcow2";
+                    features.lazy_refcounts = {};
+                  };
+                };
               }
             ];
           }
diff --git a/accounts/gkleen@sif/libvirt/pool-default.xml b/accounts/gkleen@sif/libvirt/pool-default.xml
deleted file mode 100644
index 7303830b..00000000
--- a/accounts/gkleen@sif/libvirt/pool-default.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<pool type='dir'>
-  <name>default</name>
-  <uuid>ad899c92-02e3-45f9-bf49-195467aba2e2</uuid>
-  <capacity unit='bytes'>1492738072064</capacity>
-  <allocation unit='bytes'>215387853312</allocation>
-  <available unit='bytes'>1277350218752</available>
-  <source>
-  </source>
-  <target>
-    <path>/home/gkleen/.local/share/libvirt/images</path>
-    <permissions>
-      <mode>0711</mode>
-      <owner>1000</owner>
-      <group>100</group>
-    </permissions>
-  </target>
-</pool>
-
diff --git a/accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml b/accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml
deleted file mode 100644
index e160ae4d..00000000
--- a/accounts/gkleen@sif/libvirt/vol-lmmirzm-vmrz01.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<volume type='file'>
-  <name>lmmirzm-vmrz01.qcow2</name>
-  <capacity unit='G'>40</capacity>
-  <target>
-    <path>/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2</path>
-    <format type='qcow2'/>
-    <permissions>
-      <mode>0600</mode>
-      <owner>1000</owner>
-      <group>100</group>
-    </permissions>
-    <features>
-      <lazy_refcounts/>
-    </features>
-  </target>
-</volume>
-