From 20e6c75501b8e7e106cae51a4386e3429b4660d5 Mon Sep 17 00:00:00 2001
From: Chris Toph <toph@ryot.foo>
Date: Thu, 29 May 2025 00:23:40 -0400
Subject: [PATCH] Refactor for temp VM configuration in Gojo host setup and
 update hardware settings

---
 hosts/nixos/gojo/default.nix  | 11 +++++++++++
 hosts/nixos/gojo/hardware.nix | 17 ++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/hosts/nixos/gojo/default.nix b/hosts/nixos/gojo/default.nix
index 50fff59..7443ebd 100644
--- a/hosts/nixos/gojo/default.nix
+++ b/hosts/nixos/gojo/default.nix
@@ -70,6 +70,17 @@ in
     PROTON_USE_D9VK = 1;
   };
 
+  # FIXME: Remove once out of VM
+  # VM guest additions to improve host-guest interaction
+  services.spice-vdagentd.enable = true;
+  services.qemuGuest.enable = true;
+  virtualisation.vmware.guest.enable = pkgs.stdenv.hostPlatform.isx86;
+  virtualisation.hypervGuest.enable = true;
+  services.xe-guest-utilities.enable = pkgs.stdenv.hostPlatform.isx86;
+  # The VirtualBox guest additions rely on an out-of-tree kernel module
+  # which lags behind kernel releases, potentially causing broken builds.
+  virtualisation.virtualbox.guest.enable = false;
+
   # https://wiki.nixos.org/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "25.11";
 }
diff --git a/hosts/nixos/gojo/hardware.nix b/hosts/nixos/gojo/hardware.nix
index ada9434..a66bdae 100644
--- a/hosts/nixos/gojo/hardware.nix
+++ b/hosts/nixos/gojo/hardware.nix
@@ -1,3 +1,4 @@
+# FIXME: FIX to hardware.fix once out of VM, this is TEMP vm hardware config
 {
   config,
   lib,
@@ -11,9 +12,6 @@ in
 {
   imports = lib.flatten [
     (modulesPath + "/profiles/qemu-guest.nix")
-    (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/pool.nix"
-    ])
   ];
 
   ## Boot ##
@@ -46,13 +44,14 @@ in
     extraModulePackages = [ ];
   };
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/7ec7d686-6f4c-482f-8b9d-4337a06afc48";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/5f1ad3a9-18ce-42ab-83ea-b67bccaa6972";
+    fsType = "ext4";
   };
-  swapDevices = [ ];
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/e3fc8d25-31a5-48c1-8c81-c6c237f671bb"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's