From 43b5bedb489595918d13bf15cb55aa1df59aee39 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sat, 1 Aug 2026 23:41:36 +0100
Subject: [PATCH] nixos/vms: Fix LVM disk helper regression

Adding volume-group support changed the LVM disk helper's argument
meaning, so standard VM disks and the legacy darts calls resolved disk
names as volume groups.

Restore the main volume group for standard disks and map the differently
named darts volumes explicitly.
---
 lib/default.nix                    | 2 +-
 nixos/boxes/colony/vms/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index ca0c035..39f997a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -191,7 +191,7 @@ rec {
     };
     lvmDisk' = vg: lv: lvmDisk'' lv vg lv;
     lvmDisk = lvmDisk' "main";
-    disk = vm: lv: lvmDisk' lv "vm-${vm}-${lv}";
+    disk = vm: lv: lvmDisk'' lv "main" "vm-${vm}-${lv}";
   };
 
   deploy-rs =
diff --git a/nixos/boxes/colony/vms/default.nix b/nixos/boxes/colony/vms/default.nix
index 0110e90..8aff696 100644
--- a/nixos/boxes/colony/vms/default.nix
+++ b/nixos/boxes/colony/vms/default.nix
@@ -212,8 +212,8 @@
             cleanShutdown.timeout = 120;
             drives = [
               (mkMerge [ (vm.disk "darts" "root") { frontendOpts.bootindex = 0; } ])
-              (vm.lvmDisk' "media" "darts-media")
-              (vm.lvmDisk' "ext" "darts-ext")
+              (vm.lvmDisk'' "media" "main" "darts-media")
+              (vm.lvmDisk'' "ext" "main" "darts-ext")
             ];
           };
         };