From 862cdcda9bc1ab74f76023b06733fd2a007b88c0 Mon Sep 17 00:00:00 2001
From: Romain Paquet <rpqt@rpqt.fr>
Date: Sat, 19 Jul 2025 18:48:09 +0200
Subject: [PATCH] migrate from clan disk-id to standalone disko

---
 machines/crocus/configuration.nix |  2 --
 machines/crocus/disko.nix         | 13 ++-----------
 machines/genepi/configuration.nix |  2 --
 machines/genepi/disko.nix         | 13 ++-----------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/machines/crocus/configuration.nix b/machines/crocus/configuration.nix
index ff96a69..fa73c77 100644
--- a/machines/crocus/configuration.nix
+++ b/machines/crocus/configuration.nix
@@ -39,8 +39,6 @@
     "zts7mq7onf"
   ];
 
-  disko.devices.disk.main.device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_48353082";
-
   boot.loader.grub = {
     efiSupport = true;
     efiInstallAsRemovable = true;
diff --git a/machines/crocus/disko.nix b/machines/crocus/disko.nix
index af03c18..b529126 100644
--- a/machines/crocus/disko.nix
+++ b/machines/crocus/disko.nix
@@ -1,17 +1,8 @@
 {
-  clan-core,
-  config,
-  ...
-}:
-let
-  suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;
-in
-{
-  imports = [ clan-core.clanModules.disk-id ];
-
   disko.devices.disk.main = {
-    name = "main-" + suffix;
+    name = "main-dbca87cd30a5498488026c65b37eba60";
     type = "disk";
+    device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_48353082";
     content = {
       type = "gpt";
       partitions = {
diff --git a/machines/genepi/configuration.nix b/machines/genepi/configuration.nix
index 4abf704..ef792ea 100644
--- a/machines/genepi/configuration.nix
+++ b/machines/genepi/configuration.nix
@@ -33,8 +33,6 @@
 
   clan.core.settings.state-version.enable = true;
 
-  disko.devices.disk.main.device = "/dev/disk/by-id/ata-WD_Green_M.2_2280_480GB_2251E6411147";
-
   nix.gc = {
     automatic = true;
     dates = "weekly";
diff --git a/machines/genepi/disko.nix b/machines/genepi/disko.nix
index cdcf453..908efe6 100644
--- a/machines/genepi/disko.nix
+++ b/machines/genepi/disko.nix
@@ -1,17 +1,8 @@
 {
-  clan-core,
-  config,
-  ...
-}:
-let
-  suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;
-in
-{
-  imports = [ clan-core.clanModules.disk-id ];
-
   disko.devices.disk.main = {
-    name = "main-" + suffix;
+    name = "main-72b27bb5253045f38a07b6bc368ab85c";
     type = "disk";
+    device = "/dev/disk/by-id/ata-WD_Green_M.2_2280_480GB_2251E6411147";
     content = {
       type = "gpt";
       partitions = {