From 82feea9ce4bdcca7eb3ece34141cb8e97837ad92 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 4 Aug 2026 23:09:17 +0100
Subject: [PATCH] various: set cpu/gpu indvidually

---
 modules/nixos/hardware/cloud/upcloud/garden.nix | 13 +++----------
 modules/nixos/hardware/cpu/amd.nix              |  2 +-
 modules/nixos/hardware/cpu/intel.nix            |  2 +-
 systems/isis/default.nix                        |  3 +++
 systems/minerva/default.nix                     |  6 ++----
 systems/skadi/default.nix                       |  6 ++----
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/modules/nixos/hardware/cloud/upcloud/garden.nix b/modules/nixos/hardware/cloud/upcloud/garden.nix
index 41b2255f..1d851387 100644
--- a/modules/nixos/hardware/cloud/upcloud/garden.nix
+++ b/modules/nixos/hardware/cloud/upcloud/garden.nix
@@ -9,16 +9,9 @@ in
   };
 
   config = mkIf config.garden.profiles.upcloud.enable {
-    garden = {
-      device = {
-        cpu = "intel";
-        gpu = "intel";
-      };
-
-      system.boot = {
-        loader = "grub";
-        grub.device = "/dev/vda";
-      };
+    garden.system.boot = {
+      loader = "grub";
+      grub.device = "/dev/vda";
     };
   };
 }
diff --git a/modules/nixos/hardware/cpu/amd.nix b/modules/nixos/hardware/cpu/amd.nix
index 4d5dde87..446ca907 100644
--- a/modules/nixos/hardware/cpu/amd.nix
+++ b/modules/nixos/hardware/cpu/amd.nix
@@ -4,7 +4,7 @@ let
   inherit (config.garden) device;
 in
 {
-  config = mkIf (device.cpu == "amd" || device.cpu == "vm-amd") {
+  config = mkIf (device.cpu == "amd") {
     hardware.cpu.amd.updateMicrocode = true;
 
     boot.kernelModules = [
diff --git a/modules/nixos/hardware/cpu/intel.nix b/modules/nixos/hardware/cpu/intel.nix
index 9701c7c3..8f4a48ee 100644
--- a/modules/nixos/hardware/cpu/intel.nix
+++ b/modules/nixos/hardware/cpu/intel.nix
@@ -4,7 +4,7 @@ let
   inherit (config.garden) device;
 in
 {
-  config = mkIf (device.cpu == "intel" || device.cpu == "vm-intel") {
+  config = mkIf (device.cpu == "intel") {
     hardware.cpu.intel.updateMicrocode = true;
 
     boot = {
diff --git a/systems/isis/default.nix b/systems/isis/default.nix
index 12da6621..d2389478 100644
--- a/systems/isis/default.nix
+++ b/systems/isis/default.nix
@@ -8,6 +8,9 @@
       upcloud.enable = true;
     };
 
+    # AMD EPYC 9575F, no gpu
+    device.cpu = "vm-amd";
+
     services = {
       nginx = {
         enable = true;
diff --git a/systems/minerva/default.nix b/systems/minerva/default.nix
index 78b60576..de0f728a 100644
--- a/systems/minerva/default.nix
+++ b/systems/minerva/default.nix
@@ -16,10 +16,8 @@
       };
     };
 
-    device = {
-      cpu = "amd";
-      gpu = null;
-    };
+    # AMD EPYC-Rome, no gpu
+    device.cpu = "vm-amd";
 
     services = {
       anubis.enable = true;
diff --git a/systems/skadi/default.nix b/systems/skadi/default.nix
index 0f262a55..dbfed041 100644
--- a/systems/skadi/default.nix
+++ b/systems/skadi/default.nix
@@ -14,10 +14,8 @@
       };
     };
 
-    device = {
-      cpu = null;
-      gpu = null;
-    };
+    # ampere altra, aarch64
+    device.cpu = null;
 
     system = {
       boot = {
-- 
2.51.2