From a90c4909d505852aba11f1ba2ba84bc87e6c7c63 Mon Sep 17 00:00:00 2001
From: beatzaplenty <wayne.bennett@live.com>
Date: Sun, 19 Jul 2026 16:30:02 +1000
Subject: [PATCH] Consolidate minimal-buildtype hosts onto a single nix-minimal
 identity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

linode-minimal, proxmox-minimal, and lxc-minimal now all share
hosts/nix-minimal/host.nix instead of three separate per-platform
host files with different hostnames — every minimal-buildtype host is
named nix-minimal regardless of which platform it runs on.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 flake.nix                                       | 6 +++---
 hosts/linode-minimal/host.nix                   | 9 ---------
 hosts/lxc-minimal/host.nix                      | 9 ---------
 hosts/{proxmox-minimal => nix-minimal}/host.nix | 0
 variables.nix                                   | 1 +
 5 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 hosts/linode-minimal/host.nix
 delete mode 100644 hosts/lxc-minimal/host.nix
 rename hosts/{proxmox-minimal => nix-minimal}/host.nix (100%)

diff --git a/flake.nix b/flake.nix
index 9bd6053..54faa02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,9 +62,9 @@
       # variant (PXE/DHCP/TFTP need LAN L2 adjacency, which a Linode VPS
       # doesn't have).
       generatedTargets = {
-        linode-minimal = mkTarget { platform = "linode"; buildType = "minimal"; hostPath = ./hosts/linode-minimal/host.nix; };
-        proxmox-minimal = mkTarget { platform = "proxmox"; buildType = "minimal"; hostPath = ./hosts/proxmox-minimal/host.nix; };
-        lxc-minimal = mkTarget { platform = "lxc"; buildType = "minimal"; hostPath = ./hosts/lxc-minimal/host.nix; };
+        linode-minimal = mkTarget { platform = "linode"; buildType = "minimal"; hostPath = ./hosts/nix-minimal/host.nix; };
+        proxmox-minimal = mkTarget { platform = "proxmox"; buildType = "minimal"; hostPath = ./hosts/nix-minimal/host.nix; };
+        lxc-minimal = mkTarget { platform = "lxc"; buildType = "minimal"; hostPath = ./hosts/nix-minimal/host.nix; };
 
         linode-nix-cache = mkTarget { platform = "linode"; buildType = "nix-cache"; hostPath = ./hosts/nix-cache/host.nix; };
         proxmox-nix-cache = mkTarget { platform = "proxmox"; buildType = "nix-cache"; hostPath = ./hosts/nix-cache/host.nix; };
diff --git a/hosts/linode-minimal/host.nix b/hosts/linode-minimal/host.nix
deleted file mode 100644
index 40752df..0000000
--- a/hosts/linode-minimal/host.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  networking.hostName = "linode-minimal";
-
-  # Preserved from the pre-refactor `linode-minimal` target — stateVersion
-  # must never be bumped on an already-installed machine.
-  system.stateVersion = "26.05";
-}
diff --git a/hosts/lxc-minimal/host.nix b/hosts/lxc-minimal/host.nix
deleted file mode 100644
index 8d2828d..0000000
--- a/hosts/lxc-minimal/host.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  networking.hostName = "lxc-minimal";
-
-  # No pre-existing deployed machine to preserve — pin explicitly to the
-  # current release rather than let it silently default.
-  system.stateVersion = "26.05";
-}
diff --git a/hosts/proxmox-minimal/host.nix b/hosts/nix-minimal/host.nix
similarity index 100%
rename from hosts/proxmox-minimal/host.nix
rename to hosts/nix-minimal/host.nix
diff --git a/variables.nix b/variables.nix
index c1691b0..1ab2fe5 100644
--- a/variables.nix
+++ b/variables.nix
@@ -10,6 +10,7 @@
   # Cross-host references (LAN hostnames/users other hosts reach over the network)
   nixCacheHost = "nix-cache"; # substituter/remote-builder hostname
   nfsServerHost = "server"; # NFS export source hostname
+
   remoteBuilderUser = "nixremote"; # remote builder SSH user
 
   # System