From 2cb4c6a686a149cc3fb796bafe245b6c8f259547 Mon Sep 17 00:00:00 2001
From: ISnortPennies <ISnortPennies@protonmail.com>
Date: Sun, 8 Jan 2023 12:37:54 -0500
Subject: [PATCH] Tweaked vm settings

---
 configuration.nix |  2 ++
 misc/Windows.xml  | 37 +++++++++++++++++++------------------
 modules/vfio.nix  |  6 +++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 7a39d52..3b02383 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,6 +8,8 @@
       EDITOR = "nvim";
     };
   };
+  # boot faster
+  systemd.services.NetworkManager-wait-online.enable = false;
   nix = {
     settings = {
       auto-optimise-store = true;
diff --git a/misc/Windows.xml b/misc/Windows.xml
index f8b7cd1..93dc574 100644
--- a/misc/Windows.xml
+++ b/misc/Windows.xml
@@ -3,25 +3,25 @@
   <uuid>035e02d8-04d3-05e5-4706-900700080009</uuid>
   <memory unit="KiB">16777216</memory>
   <currentMemory unit="KiB">16777216</currentMemory>
-  <vcpu placement="static" cpuset="8-15,24-31">16</vcpu>
+  <vcpu placement="static" cpuset="0-7,16-23">16</vcpu>
   <cputune>
-    <vcpupin vcpu="0" cpuset="8"/>
-    <vcpupin vcpu="1" cpuset="24"/>
-    <vcpupin vcpu="2" cpuset="9"/>
-    <vcpupin vcpu="3" cpuset="25"/>
-    <vcpupin vcpu="4" cpuset="10"/>
-    <vcpupin vcpu="5" cpuset="26"/>
-    <vcpupin vcpu="6" cpuset="11"/>
-    <vcpupin vcpu="7" cpuset="27"/>
-    <vcpupin vcpu="8" cpuset="12"/>
-    <vcpupin vcpu="9" cpuset="28"/>
-    <vcpupin vcpu="10" cpuset="13"/>
-    <vcpupin vcpu="11" cpuset="29"/>
-    <vcpupin vcpu="12" cpuset="14"/>
-    <vcpupin vcpu="13" cpuset="30"/>
-    <vcpupin vcpu="14" cpuset="15"/>
-    <vcpupin vcpu="15" cpuset="31"/>
-    <emulatorpin cpuset="0-7,16-23"/>
+    <vcpupin vcpu="0" cpuset="0"/>
+    <vcpupin vcpu="1" cpuset="16"/>
+    <vcpupin vcpu="2" cpuset="1"/>
+    <vcpupin vcpu="3" cpuset="17"/>
+    <vcpupin vcpu="4" cpuset="2"/>
+    <vcpupin vcpu="5" cpuset="18"/>
+    <vcpupin vcpu="6" cpuset="3"/>
+    <vcpupin vcpu="7" cpuset="19"/>
+    <vcpupin vcpu="8" cpuset="4"/>
+    <vcpupin vcpu="9" cpuset="20"/>
+    <vcpupin vcpu="10" cpuset="5"/>
+    <vcpupin vcpu="11" cpuset="21"/>
+    <vcpupin vcpu="12" cpuset="6"/>
+    <vcpupin vcpu="13" cpuset="22"/>
+    <vcpupin vcpu="14" cpuset="7"/>
+    <vcpupin vcpu="15" cpuset="23"/>
+    <emulatorpin cpuset="8-15,24-31"/>
   </cputune>
   <os>
     <type arch="x86_64" machine="pc-q35-7.2">hvm</type>
@@ -58,6 +58,7 @@
   <cpu mode="host-passthrough" check="none" migratable="off">
     <topology sockets="1" dies="1" cores="8" threads="2"/>
     <cache mode="passthrough"/>
+    <feature policy="require" name="topoext"/>
   </cpu>
   <clock offset="localtime">
     <timer name="rtc" present="no" tickpolicy="catchup"/>
diff --git a/modules/vfio.nix b/modules/vfio.nix
index d696339..dba7448 100644
--- a/modules/vfio.nix
+++ b/modules/vfio.nix
@@ -33,9 +33,9 @@
 
       if [ "$GUEST_NAME" == "Windows" ]; then
         if [ "$OPERATION" == "start" ]; then
-          systemctl set-property --runtime -- user.slice AllowedCPUs=0-7,16-23
-          systemctl set-property --runtime -- system.slice AllowedCPUs=0-7,16-23
-          systemctl set-property --runtime -- init.scope AllowedCPUs=0-7,16-23
+          systemctl set-property --runtime -- user.slice AllowedCPUs=8-15,24-31
+          systemctl set-property --runtime -- system.slice AllowedCPUs=8-15,24-31
+          systemctl set-property --runtime -- init.scope AllowedCPUs=8-15,24-31
         fi
 
         if [ "$OPERATION" == "stopped" ]; then