From 7cbf708ecf00a95d1be54251876ccf14e9e0d25f Mon Sep 17 00:00:00 2001
From: Fern Garden <mail@fern.garden>
Date: Sun, 14 Sep 2025 22:35:01 +0800
Subject: [PATCH] Move VM disks out of host config

---
 hosts/docker/default.nix         | 21 +--------------------
 hosts/minecraft/default.nix      | 23 +----------------------
 hosts/musicbrainz/default.nix    | 23 +----------------------
 suites/server/docker/default.nix |  6 ++++++
 suites/server/vm/default.nix     | 14 +++++++++++++-
 5 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/hosts/docker/default.nix b/hosts/docker/default.nix
index dd16f03..c1ebcdd 100644
--- a/hosts/docker/default.nix
+++ b/hosts/docker/default.nix
@@ -1,23 +1,4 @@
-{pkgs, ...}: let
-  rootDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
-  rootPart = "/dev/disk/by-uuid/5dc8ca3b-177a-458e-b8a8-89309168d0fc";
-  dockerPart = "/dev/disk/by-uuid/95461a94-ad91-43b9-b502-2b5d4496b84e";
-in {
-  # Boot loader.
-  boot.loader.grub.device = rootDisk;
-
-  # Root filesystem.
-  fileSystems."/" = {
-    device = rootPart;
-    fsType = "ext4";
-  };
-
-  # Docker data directory
-  fileSystems."/home/fern/docker" = {
-    device = dockerPart;
-    fsType = "ext4";
-  };
-
+{pkgs, ...}: {
   # Media HDDs.
   fileSystems."/mnt/hdd0" = {
     device = "/dev/disk/by-uuid/fcee0188-8ca1-4fda-81b7-f5920c79ab48";
diff --git a/hosts/minecraft/default.nix b/hosts/minecraft/default.nix
index 7bae263..2c63c08 100644
--- a/hosts/minecraft/default.nix
+++ b/hosts/minecraft/default.nix
@@ -1,23 +1,2 @@
-let
-  rootDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
-  rootPart = "/dev/disk/by-uuid/f59330d9-0315-43c0-90a1-d9b13c6298f9";
-  dockerPart = "/dev/disk/by-uuid/3730e48a-8784-4c49-8692-473c9b4bc8c3";
-in {
-  # Bootloader.
-  boot.loader.grub.device = rootDisk;
-
-  # Root filesystem.
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/root";
-    fsType = "ext4";
-  };
-
-  # Docker data directory.
-  fileSystems."/home/fern/docker" = {
-    device = "/dev/disk/by-label/docker";
-    fsType = "ext4";
-  };
-
-  # Swap partition.
-  swapDevices = [{device = "/dev/disk/by-label/swap";}];
+{
 }
diff --git a/hosts/musicbrainz/default.nix b/hosts/musicbrainz/default.nix
index db195ad..a5d8ab9 100644
--- a/hosts/musicbrainz/default.nix
+++ b/hosts/musicbrainz/default.nix
@@ -1,25 +1,4 @@
-{pkgs, ...}: let
-  rootDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
-  rootPart = "/dev/disk/by-uuid/d90b9f44-42fb-4ccc-8b8d-05375d953742";
-  dockerPart = "/dev/disk/by-uuid/0eb05c79-7765-4b7e-bf22-c3a53f516db5";
-in {
-  boot.loader.grub.device = rootDisk;
-
-  # Root filesystem.
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/root";
-    fsType = "ext4";
-  };
-
-  # Docker data directory.
-  fileSystems."/home/fern/docker" = {
-    device = "/dev/disk/by-label/docker";
-    fsType = "ext4";
-  };
-
-  # Swap partition.
-  swapDevices = [{device = "/dev/disk/by-label/swap";}];
-
+{pkgs, ...}: {
   # Update Musicbrainz search indexes once a week.
   systemd.timers."musicbrainz-update-indexes" = {
     wantedBy = ["timers.target"];
diff --git a/suites/server/docker/default.nix b/suites/server/docker/default.nix
index af46ad8..90d3675 100644
--- a/suites/server/docker/default.nix
+++ b/suites/server/docker/default.nix
@@ -1,4 +1,10 @@
 {
+  # Docker data directory
+  fileSystems."/home/fern/docker" = {
+    device = "/dev/disk/by-label/docker";
+    fsType = "ext4";
+  };
+
   # Add user to docker group.
   users.users.fern = {
     extraGroups = ["docker"];
diff --git a/suites/server/vm/default.nix b/suites/server/vm/default.nix
index 22b57e7..1dc413f 100644
--- a/suites/server/vm/default.nix
+++ b/suites/server/vm/default.nix
@@ -16,7 +16,19 @@
   boot.kernelModules = ["kvm-intel"];
 
   # Configure the bootloader.
-  boot.loader.grub.enable = true;
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+  };
+
+  # Root filesystem.
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/root";
+    fsType = "ext4";
+  };
+
+  # Swap partition.
+  swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
   # Enable QEMU guest agent
   services.qemuGuest.enable = true;