From 00f9d08a4bd38df837e8b6b7ee9b4c88f64396f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 27 Aug 2025 15:22:41 +0200
Subject: [PATCH] remove diskId from existing templates

we don't have a replacement yet, but at least this will work.
---
 docs/code-examples/disko-raid.nix           | 4 +---
 docs/code-examples/disko-single-disk.nix    | 4 +---
 templates/machine/flash-installer/disko.nix | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/code-examples/disko-raid.nix b/docs/code-examples/disko-raid.nix
index 0af69ee5e..92df46015 100644
--- a/docs/code-examples/disko-raid.nix
+++ b/docs/code-examples/disko-raid.nix
@@ -1,13 +1,11 @@
 {
   lib,
-  config,
   ...
 }:
 let
-  suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;
   mirrorBoot = idx: {
     # suffix is to prevent disk name collisions
-    name = idx + suffix;
+    name = idx;
     type = "disk";
     device = "/dev/disk/by-id/${idx}";
     content = {
diff --git a/docs/code-examples/disko-single-disk.nix b/docs/code-examples/disko-single-disk.nix
index d3884c33d..60194ebe2 100644
--- a/docs/code-examples/disko-single-disk.nix
+++ b/docs/code-examples/disko-single-disk.nix
@@ -1,13 +1,11 @@
 {
   lib,
-  config,
   ...
 }:
 let
-  suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;
   mirrorBoot = idx: {
     # suffix is to prevent disk name collisions
-    name = idx + suffix;
+    name = idx;
     type = "disk";
     device = "/dev/disk/by-id/${idx}";
     content = {
diff --git a/templates/machine/flash-installer/disko.nix b/templates/machine/flash-installer/disko.nix
index 60e2b5f14..03101467f 100644
--- a/templates/machine/flash-installer/disko.nix
+++ b/templates/machine/flash-installer/disko.nix
@@ -1,15 +1,11 @@
-{ config, lib, ... }:
-
-let
-  suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;
-in
+{ lib, ... }:
 {
   boot.loader.grub.efiSupport = lib.mkDefault true;
   boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true;
   disko.devices = {
     disk = {
       "main" = {
-        name = "main-" + suffix;
+        name = "main";
         type = "disk";
         device = lib.mkDefault "/dev/null";
         content = {