From 8420b1575778b7395d9cf5f33599a4a6e6239923 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Wed, 17 Mar 2021 04:49:43 +0000
Subject: [PATCH] fixed alacritty+dmenu dependency of sway, nixdirfmt

---
 config/hosts/boline/configuration.nix    |   5 +-
 config/hosts/samhain/vm/default.nix      |  14 +-
 config/hosts/samhain/vm/win10.xml.nix    | 512 +++++++++++------------
 config/profiles/kat/home/zsh/default.nix |   2 +-
 config/profiles/sway/nixos/sway.nix      |   7 +-
 5 files changed, 272 insertions(+), 268 deletions(-)

diff --git a/config/hosts/boline/configuration.nix b/config/hosts/boline/configuration.nix
index 45ab91be..f93aad2d 100644
--- a/config/hosts/boline/configuration.nix
+++ b/config/hosts/boline/configuration.nix
@@ -1,10 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./hardware.nix
-    ../../services/nginx.nix
-  ];
+  imports = [ ./hardware.nix ../../services/nginx.nix ];
 
   deploy.profiles = [ "kat" ];
   deploy.ssh.host = "boline.kittywit.ch";
diff --git a/config/hosts/samhain/vm/default.nix b/config/hosts/samhain/vm/default.nix
index ce74221d..a4155559 100644
--- a/config/hosts/samhain/vm/default.nix
+++ b/config/hosts/samhain/vm/default.nix
@@ -70,13 +70,15 @@
       type = "oneshot";
       RemainAfterExit = "yes";
     };
-    script = let xml = pkgs.writeText "libvirt-guest-win10.xml" (import ./win10.xml.nix {}); in ''
-        uuid="$(${pkgs.libvirt}/bin/virsh domuuid 'win10' || true)"
-        ${pkgs.libvirt}/bin/virsh define <(sed "s/UUID/$uuid/" '${xml}')
-        ${pkgs.libvirt}/bin/virsh start 'win10';
+    script = let
+      xml =
+        pkgs.writeText "libvirt-guest-win10.xml" (import ./win10.xml.nix { });
+    in ''
+      uuid="$(${pkgs.libvirt}/bin/virsh domuuid 'win10' || true)"
+      ${pkgs.libvirt}/bin/virsh define <(sed "s/UUID/$uuid/" '${xml}')
+      ${pkgs.libvirt}/bin/virsh start 'win10';
     '';
-  preStop =
-    ''
+    preStop = ''
       ${pkgs.libvirt}/bin/virsh shutdown 'win10'
       let "timeout = $(date +%s) + 120"
       while [ "$(${pkgs.libvirt}/bin/virsh list --name | grep --count '^win10$')" -gt 0 ]; do
diff --git a/config/hosts/samhain/vm/win10.xml.nix b/config/hosts/samhain/vm/win10.xml.nix
index 3cc7d0e7..a931275f 100644
--- a/config/hosts/samhain/vm/win10.xml.nix
+++ b/config/hosts/samhain/vm/win10.xml.nix
@@ -1,260 +1,260 @@
 { ... }:
 
 ''
-<domain xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0" type="kvm">
-  <name>win10</name>
-  <uuid>UUID</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://microsoft.com/win/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit="KiB">12582912</memory>
-  <currentMemory unit="KiB">12582912</currentMemory>
-  <vcpu placement="static">6</vcpu>
-  <iothreads>1</iothreads>
-  <cputune>
-    <vcpupin vcpu="0" cpuset="0"/>
-    <vcpupin vcpu="1" cpuset="1"/>
-    <vcpupin vcpu="2" cpuset="2"/>
-    <vcpupin vcpu="3" cpuset="6"/>
-    <vcpupin vcpu="4" cpuset="7"/>
-    <vcpupin vcpu="5" cpuset="8"/>
-    <emulatorpin cpuset="3,9"/>
-    <iothreadpin iothread="1" cpuset="3,9"/>
-  </cputune>
-  <os>
-    <type arch="x86_64" machine="pc-q35-5.1">hvm</type>
-    <loader readonly="yes" type="pflash">/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
-    <nvram>/var/lib/libvirt/qemu/nvram/win10_VARS.fd</nvram>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <hyperv>
-      <relaxed state="on"/>
-      <vapic state="on"/>
-      <spinlocks state="on" retries="8191"/>
-    </hyperv>
-    <vmport state="off"/>
-  </features>
-  <cpu mode="host-passthrough" check="partial">
-    <topology sockets="1" dies="1" cores="3" threads="2"/>
-    <cache mode="passthrough"/>
-    <feature policy="require" name="topoext"/>
-  </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="raw" discard="unmap"/>
-      <source file="/dev/disk/by-id/ata-HFS256G32TNF-N3A0A_MJ8BN15091150BM1Z"/>
-      <target dev="sda" bus="scsi"/>
-      <boot order="2"/>
-      <address type="drive" controller="0" bus="0" target="0" unit="0"/>
-    </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-to-pci-bridge">
-      <model name="pcie-pci-bridge"/>
-      <address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
-    </controller>
-    <controller type="pci" index="9" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="9" port="0x17"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x7"/>
-    </controller>
-    <controller type="pci" index="10" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="10" port="0x8"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0" multifunction="on"/>
-    </controller>
-    <controller type="pci" index="11" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="11" port="0x9"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x1"/>
-    </controller>
-    <controller type="pci" index="12" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="12" port="0xa"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x2"/>
-    </controller>
-    <controller type="pci" index="13" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="13" port="0xb"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x3"/>
-    </controller>
-    <controller type="pci" index="14" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="14" port="0xc"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x4"/>
-    </controller>
-    <controller type="pci" index="15" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="15" port="0xd"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x5"/>
-    </controller>
-    <controller type="pci" index="16" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="16" port="0xe"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x6"/>
-    </controller>
-    <controller type="pci" index="17" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="17" port="0xf"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x7"/>
-    </controller>
-    <controller type="pci" index="18" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="18" port="0x18"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x0" multifunction="on"/>
-    </controller>
-    <controller type="pci" index="19" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="19" port="0x19"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x1"/>
-    </controller>
-    <controller type="pci" index="20" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="20" port="0x1a"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x2"/>
-    </controller>
-    <controller type="pci" index="21" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="21" port="0x1b"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x3"/>
-    </controller>
-    <controller type="pci" index="22" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="22" port="0x1c"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x4"/>
-    </controller>
-    <controller type="pci" index="23" model="pcie-root-port">
-      <model name="pcie-root-port"/>
-      <target chassis="23" port="0x1d"/>
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x5" multifunction="on"/>
-    </controller>
-    <controller type="pci" index="24" model="pcie-to-pci-bridge">
-      <model name="pcie-pci-bridge"/>
-      <address type="pci" domain="0x0000" bus="0x0a" slot="0x00" function="0x0"/>
-    </controller>
-    <controller type="virtio-serial" index="0">
-      <address type="pci" domain="0x0000" bus="0x03" slot="0x00" function="0x0"/>
-    </controller>
-    <controller type="scsi" index="0" model="virtio-scsi">
-      <address type="pci" domain="0x0000" bus="0x06" slot="0x00" function="0x0"/>
-    </controller>
-    <controller type="sata" index="0">
-      <address type="pci" domain="0x0000" bus="0x00" slot="0x1f" function="0x2"/>
-    </controller>
-    <interface type="network">
-      <mac address="52:54:00:61:87:37"/>
-      <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"/>
-    <hostdev mode="subsystem" type="pci" managed="yes">
-      <source>
-        <address domain="0x0000" bus="0x26" slot="0x00" function="0x0"/>
-      </source>
-      <rom file="${./vbios.rom}"/>
-      <address type="pci" domain="0x0000" bus="0x07" slot="0x00" function="0x0"/>
-    </hostdev>
-    <hostdev mode="subsystem" type="pci" managed="yes">
-      <source>
-        <address domain="0x0000" bus="0x26" slot="0x00" function="0x1"/>
-      </source>
-      <address type="pci" domain="0x0000" bus="0x09" slot="0x00" function="0x0"/>
-    </hostdev>
-    <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>
-    <memballoon model="virtio">
-      <address type="pci" domain="0x0000" bus="0x05" slot="0x00" function="0x0"/>
-    </memballoon>
-  </devices>
-  <qemu:commandline>
-    <qemu:arg value="-chardev"/>
-    <qemu:arg value="socket,path=/tmp/vfio-qmp,server,nowait,id=qmp0"/>
-    <qemu:arg value="-mon"/>
-    <qemu:arg value="chardev=qmp0,id=qmp,mode=control"/>
-    <qemu:arg value="-chardev"/>
-    <qemu:arg value="socket,path=/tmp/vfio-qga,server,nowait,id=qga0"/>
-    <qemu:arg value="-device"/>
-    <qemu:arg value="virtserialport,chardev=qga0,name=org.qemu.guest_agent.0"/>
-    <qemu:arg value="-set"/>
-    <qemu:arg value="device.scsi0-0-0-0.rotation_rate=1"/>
-    <qemu:arg value="-cpu"/>
-    <qemu:arg value="host,hv_time,kvm=off,hv_vendor_id=null,-hypervisor"/>
-  </qemu:commandline>
-  </domain>
+  <domain xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0" type="kvm">
+    <name>win10</name>
+    <uuid>UUID</uuid>
+    <metadata>
+      <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+        <libosinfo:os id="http://microsoft.com/win/10"/>
+      </libosinfo:libosinfo>
+    </metadata>
+    <memory unit="KiB">12582912</memory>
+    <currentMemory unit="KiB">12582912</currentMemory>
+    <vcpu placement="static">6</vcpu>
+    <iothreads>1</iothreads>
+    <cputune>
+      <vcpupin vcpu="0" cpuset="0"/>
+      <vcpupin vcpu="1" cpuset="1"/>
+      <vcpupin vcpu="2" cpuset="2"/>
+      <vcpupin vcpu="3" cpuset="6"/>
+      <vcpupin vcpu="4" cpuset="7"/>
+      <vcpupin vcpu="5" cpuset="8"/>
+      <emulatorpin cpuset="3,9"/>
+      <iothreadpin iothread="1" cpuset="3,9"/>
+    </cputune>
+    <os>
+      <type arch="x86_64" machine="pc-q35-5.1">hvm</type>
+      <loader readonly="yes" type="pflash">/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
+      <nvram>/var/lib/libvirt/qemu/nvram/win10_VARS.fd</nvram>
+    </os>
+    <features>
+      <acpi/>
+      <apic/>
+      <hyperv>
+        <relaxed state="on"/>
+        <vapic state="on"/>
+        <spinlocks state="on" retries="8191"/>
+      </hyperv>
+      <vmport state="off"/>
+    </features>
+    <cpu mode="host-passthrough" check="partial">
+      <topology sockets="1" dies="1" cores="3" threads="2"/>
+      <cache mode="passthrough"/>
+      <feature policy="require" name="topoext"/>
+    </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="raw" discard="unmap"/>
+        <source file="/dev/disk/by-id/ata-HFS256G32TNF-N3A0A_MJ8BN15091150BM1Z"/>
+        <target dev="sda" bus="scsi"/>
+        <boot order="2"/>
+        <address type="drive" controller="0" bus="0" target="0" unit="0"/>
+      </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-to-pci-bridge">
+        <model name="pcie-pci-bridge"/>
+        <address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
+      </controller>
+      <controller type="pci" index="9" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="9" port="0x17"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x7"/>
+      </controller>
+      <controller type="pci" index="10" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="10" port="0x8"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x0" multifunction="on"/>
+      </controller>
+      <controller type="pci" index="11" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="11" port="0x9"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x1"/>
+      </controller>
+      <controller type="pci" index="12" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="12" port="0xa"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x2"/>
+      </controller>
+      <controller type="pci" index="13" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="13" port="0xb"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x3"/>
+      </controller>
+      <controller type="pci" index="14" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="14" port="0xc"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x4"/>
+      </controller>
+      <controller type="pci" index="15" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="15" port="0xd"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x5"/>
+      </controller>
+      <controller type="pci" index="16" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="16" port="0xe"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x6"/>
+      </controller>
+      <controller type="pci" index="17" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="17" port="0xf"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x7"/>
+      </controller>
+      <controller type="pci" index="18" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="18" port="0x18"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x0" multifunction="on"/>
+      </controller>
+      <controller type="pci" index="19" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="19" port="0x19"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x1"/>
+      </controller>
+      <controller type="pci" index="20" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="20" port="0x1a"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x2"/>
+      </controller>
+      <controller type="pci" index="21" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="21" port="0x1b"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x3"/>
+      </controller>
+      <controller type="pci" index="22" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="22" port="0x1c"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x4"/>
+      </controller>
+      <controller type="pci" index="23" model="pcie-root-port">
+        <model name="pcie-root-port"/>
+        <target chassis="23" port="0x1d"/>
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x5" multifunction="on"/>
+      </controller>
+      <controller type="pci" index="24" model="pcie-to-pci-bridge">
+        <model name="pcie-pci-bridge"/>
+        <address type="pci" domain="0x0000" bus="0x0a" slot="0x00" function="0x0"/>
+      </controller>
+      <controller type="virtio-serial" index="0">
+        <address type="pci" domain="0x0000" bus="0x03" slot="0x00" function="0x0"/>
+      </controller>
+      <controller type="scsi" index="0" model="virtio-scsi">
+        <address type="pci" domain="0x0000" bus="0x06" slot="0x00" function="0x0"/>
+      </controller>
+      <controller type="sata" index="0">
+        <address type="pci" domain="0x0000" bus="0x00" slot="0x1f" function="0x2"/>
+      </controller>
+      <interface type="network">
+        <mac address="52:54:00:61:87:37"/>
+        <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"/>
+      <hostdev mode="subsystem" type="pci" managed="yes">
+        <source>
+          <address domain="0x0000" bus="0x26" slot="0x00" function="0x0"/>
+        </source>
+        <rom file="${./vbios.rom}"/>
+        <address type="pci" domain="0x0000" bus="0x07" slot="0x00" function="0x0"/>
+      </hostdev>
+      <hostdev mode="subsystem" type="pci" managed="yes">
+        <source>
+          <address domain="0x0000" bus="0x26" slot="0x00" function="0x1"/>
+        </source>
+        <address type="pci" domain="0x0000" bus="0x09" slot="0x00" function="0x0"/>
+      </hostdev>
+      <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>
+      <memballoon model="virtio">
+        <address type="pci" domain="0x0000" bus="0x05" slot="0x00" function="0x0"/>
+      </memballoon>
+    </devices>
+    <qemu:commandline>
+      <qemu:arg value="-chardev"/>
+      <qemu:arg value="socket,path=/tmp/vfio-qmp,server,nowait,id=qmp0"/>
+      <qemu:arg value="-mon"/>
+      <qemu:arg value="chardev=qmp0,id=qmp,mode=control"/>
+      <qemu:arg value="-chardev"/>
+      <qemu:arg value="socket,path=/tmp/vfio-qga,server,nowait,id=qga0"/>
+      <qemu:arg value="-device"/>
+      <qemu:arg value="virtserialport,chardev=qga0,name=org.qemu.guest_agent.0"/>
+      <qemu:arg value="-set"/>
+      <qemu:arg value="device.scsi0-0-0-0.rotation_rate=1"/>
+      <qemu:arg value="-cpu"/>
+      <qemu:arg value="host,hv_time,kvm=off,hv_vendor_id=null,-hypervisor"/>
+    </qemu:commandline>
+    </domain>
 ''
diff --git a/config/profiles/kat/home/zsh/default.nix b/config/profiles/kat/home/zsh/default.nix
index b7858b5a..9b757248 100644
--- a/config/profiles/kat/home/zsh/default.nix
+++ b/config/profiles/kat/home/zsh/default.nix
@@ -4,7 +4,7 @@
   config = lib.mkIf config.deploy.profile.kat {
     programs.zsh = {
       enable = true;
-      shellAliases = { 
+      shellAliases = {
         nixdirfmt = "fd --color=never .nix | xargs nixfmt";
         exa = "exa --time-style long-iso";
         ls = "exa -G";
diff --git a/config/profiles/sway/nixos/sway.nix b/config/profiles/sway/nixos/sway.nix
index 622b82a5..3d7ff252 100644
--- a/config/profiles/sway/nixos/sway.nix
+++ b/config/profiles/sway/nixos/sway.nix
@@ -1,5 +1,10 @@
 { config, pkgs, lib, sources, ... }:
 
 {
-  config = lib.mkIf config.deploy.profile.sway { programs.sway.enable = true; };
+  config = lib.mkIf config.deploy.profile.sway {
+    programs.sway = {
+      enable = true;
+      extraPackages = with pkgs; lib.mkForce [ xwayland swaylock swayidle ];
+    };
+  };
 }