From 2038a06f21c6bdbc819124f820140c60d035024a Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Thu, 12 Jun 2025 14:55:27 +0200
Subject: [PATCH] refactor(web01): remove disko dependencies

---
 .../nixos/web01/_hardware-configuration.nix   | 72 ++++++++++++++--
 machines/nixos/web01/disko.nix                | 86 -------------------
 2 files changed, 65 insertions(+), 93 deletions(-)
 delete mode 100644 machines/nixos/web01/disko.nix

diff --git a/machines/nixos/web01/_hardware-configuration.nix b/machines/nixos/web01/_hardware-configuration.nix
index 42bdc7e..9a2d013 100644
--- a/machines/nixos/web01/_hardware-configuration.nix
+++ b/machines/nixos/web01/_hardware-configuration.nix
@@ -1,12 +1,70 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ modulesPath, sources, ... }:
-
+{ modulesPath, ... }:
 {
-  imports = [
-    "${modulesPath}/profiles/qemu-guest.nix"
-    "${sources.disko}/module.nix"
-    ./disko.nix
-  ];
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "ata_piix"
+        "uhci_hcd"
+        "ehci_pci"
+        "virtio_pci"
+        "ahci"
+        "virtio_blk"
+      ];
+      kernelModules = [ ];
+      luks.devices."mainfs" = {
+        device = "/dev/disk/by-uuid/0de6ce5a-c5b6-41e3-96d0-c0381e06f94e";
+        keyFile = "/dev/zero";
+        keyFileSize = 1;
+      };
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
+      fsType = "btrfs";
+      options = [ "subvol=rootfs" ];
+    };
+
+    "/nix" = {
+      device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+    "/var/log" = {
+      device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
+      fsType = "btrfs";
+      options = [ "subvol=var-log" ];
+    };
+
+    "/mnt/btrfs-root" = {
+      device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
+      fsType = "btrfs";
+    };
+
+    "/home" = {
+      device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/2A58-A5B0";
+      fsType = "vfat";
+      options = [
+        "fmask=0022"
+        "dmask=0022"
+      ];
+    };
+  };
+
+  swapDevices = [ { device = "/dev/disk/by-uuid/9c2f1161-dc30-4bda-91aa-859bb4ec1697"; } ];
 }
diff --git a/machines/nixos/web01/disko.nix b/machines/nixos/web01/disko.nix
deleted file mode 100644
index eeb4ed9..0000000
--- a/machines/nixos/web01/disko.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
-#
-# SPDX-License-Identifier: EUPL-1.2
-
-_:
-
-let
-  luksName = "mainfs";
-in
-{
-  boot.initrd.luks.devices.${luksName} = {
-    keyFile = "/dev/zero";
-    keyFileSize = 1;
-  };
-  disko.devices = {
-    disk = {
-      vdb = {
-        device = "/dev/vdb";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              start = "1MiB";
-              label = "ESP";
-              end = "512MiB";
-              type = "EF00";
-              priority = 1;
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            luks = {
-              start = "512MiB";
-              end = "-4GiB";
-              content = rec {
-                type = "luks";
-                name = luksName;
-                extraOpenArgs = [ "--keyfile-size=1" ];
-                extraFormatArgs = extraOpenArgs;
-                settings.keyFile = "/dev/zero";
-                content = {
-                  type = "btrfs";
-                  mountpoint = "/mnt/btrfs-root";
-                  subvolumes = {
-                    "/rootfs" = {
-                      mountpoint = "/";
-                      mountOptions = [ "compress=zstd" ];
-                    };
-                    "/home" = {
-                      mountOptions = [ "compress=zstd" ];
-                      mountpoint = "/home";
-                    };
-                    "/var-log" = {
-                      mountOptions = [ "compress=zstd" ];
-                      mountpoint = "/var/log";
-                    };
-                    "/nix" = {
-                      mountOptions = [
-                        "noatime"
-                        "compress=zstd"
-                      ];
-                      mountpoint = "/nix";
-                    };
-                  };
-                };
-              };
-            };
-            swap = {
-              label = "swap";
-              start = "-4GiB";
-              end = "100%";
-              priority = 3;
-              content = {
-                type = "swap";
-                randomEncryption = true;
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}