From b2194c8187502fce29e7922527f6f2898f349e5c Mon Sep 17 00:00:00 2001
From: Frank LoTurco <floturcocantsee@protonmail.com>
Date: Fri, 23 Oct 2026 16:33:12 -0400
Subject: [PATCH] vergil: fix automatic mount ambiguity.

---
 hosts/vergil/configuration.nix | 14 +++++++++-----
 hosts/vergil/hardware.nix      |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hosts/vergil/configuration.nix b/hosts/vergil/configuration.nix
index 0fa3d88..46ad505 100644
--- a/hosts/vergil/configuration.nix
+++ b/hosts/vergil/configuration.nix
@@ -1,4 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, utils, ... }:
+let
+  disk = "/dev/storage/vm-100-disk-0";
+  diskDevice = "${utils.escapeSystemdPath disk}.device";
+in
 {
   imports = [
     ../shared/nixos-server.nix
@@ -7,14 +11,14 @@
 
   systemd.services.mount-vm-disk = {
     description = "Mount Proxmox VM disk via kpartx";
-    after = [ "storage-vm--100--disk--0.device" ];
-    wants = [ "storage-vm--100--disk--0.device" ];
+    requires = [ diskDevice ];
+    after = [ diskDevice ];
 
     serviceConfig = {
       Type = "oneshot";
       RemainAfterExit = true;
-      ExecStart = "${pkgs.multipath-tools}/sbin/kpartx -av /dev/storage/vm-100-disk-0";
-      ExecStop = "${pkgs.multipath-tools}/sbin/kpartx -dv /dev/storage/vm-100-disk-0";
+      ExecStart = "${pkgs.multipath-tools}/sbin/kpartx -av ${disk}";
+      ExecStop = "${pkgs.multipath-tools}/sbin/kpartx -dv ${disk}";
     };
 
     wantedBy = [ "multi-user.target" ];
diff --git a/hosts/vergil/hardware.nix b/hosts/vergil/hardware.nix
index 3d73d14..aedb21b 100644
--- a/hosts/vergil/hardware.nix
+++ b/hosts/vergil/hardware.nix
@@ -40,6 +40,7 @@
     options = [
       "noauto"
       "x-systemd.automount"
+      "x-systemd.requires=mount-vm-disk.service"
       "x-systemd.after=mount-vm-disk.service"
     ];
   };