From 2b01c332826d2d59b7fdbf4a7924e827338920f9 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 26 Jan 2023 16:14:47 +0100
Subject: l hilum.r: create with disko, add script

---
 lass/1systems/hilum/physical.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'lass/1systems/hilum/physical.nix')

diff --git a/lass/1systems/hilum/physical.nix b/lass/1systems/hilum/physical.nix
index f8bab57d6..e6860a496 100644
--- a/lass/1systems/hilum/physical.nix
+++ b/lass/1systems/hilum/physical.nix
@@ -1,11 +1,24 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [
     ./config.nix
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    {
+      # nice hack to carry around state passed impurely at the beginning
+      options.mainDisk = lib.mkOption {
+        type = lib.types.str;
+        default = builtins.readFile "/etc/hilum-disk";
+      };
+      config.environment.etc.hilum-disk.text = config.mainDisk;
+    }
   ];
 
+  disko.devices = import ./disk.nix {
+    inherit lib;
+    disk = config.mainDisk;
+  };
+
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
@@ -13,21 +26,9 @@
 
   boot.loader.grub.enable = true;
   boot.loader.grub.efiSupport = true;
-  boot.loader.grub.device = "/dev/disk/by-id/usb-General_USB_Flash_Disk_0374116060006128-0:0";
+  boot.loader.grub.device = config.mainDisk;
   boot.loader.grub.efiInstallAsRemovable = true;
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6db29cdd-ff64-496d-b541-5f1616665dc2";
-      fsType = "ext4";
-    };
-
-  boot.initrd.luks.devices."usb_nix".device = "/dev/disk/by-uuid/3c8ab3af-57fb-4564-9e27-b2766404f5d4";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2B9E-5131";
-      fsType = "vfat";
-    };
-
   swapDevices = [ ];
 
   nix.maxJobs = lib.mkDefault 4;
-- 
cgit v1.2.3


From 34360eb931e89b09512091fe819fb59568852441 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 26 Jan 2023 23:46:51 +0100
Subject: l hilum.r: pass luks passphrase in flash script

---
 lass/1systems/hilum/physical.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lass/1systems/hilum/physical.nix')

diff --git a/lass/1systems/hilum/physical.nix b/lass/1systems/hilum/physical.nix
index e6860a496..f97873aa9 100644
--- a/lass/1systems/hilum/physical.nix
+++ b/lass/1systems/hilum/physical.nix
@@ -12,11 +12,18 @@
       };
       config.environment.etc.hilum-disk.text = config.mainDisk;
     }
+    {
+      options.luksPassFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
+        default = null;
+      };
+    }
   ];
 
   disko.devices = import ./disk.nix {
     inherit lib;
     disk = config.mainDisk;
+    keyFile = config.luksPassFile;
   };
 
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
-- 
cgit v1.2.3


From d0b3d234e57c3960ee278c5e29feef448f958c4a Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 26 Jan 2023 23:47:07 +0100
Subject: l hilum.r: introduce tryFile

---
 lass/1systems/hilum/physical.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lass/1systems/hilum/physical.nix')

diff --git a/lass/1systems/hilum/physical.nix b/lass/1systems/hilum/physical.nix
index f97873aa9..6f160062d 100644
--- a/lass/1systems/hilum/physical.nix
+++ b/lass/1systems/hilum/physical.nix
@@ -6,9 +6,16 @@
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     {
       # nice hack to carry around state passed impurely at the beginning
-      options.mainDisk = lib.mkOption {
+      options.mainDisk = let
+        tryFile = path: default:
+          if lib.elem (builtins.baseNameOf path) (lib.attrNames (builtins.readDir (builtins.dirOf path))) then
+            builtins.readFile path
+          else
+            default
+          ;
+      in lib.mkOption {
         type = lib.types.str;
-        default = builtins.readFile "/etc/hilum-disk";
+        default = tryFile "/etc/hilum-disk" "/dev/sdz";
       };
       config.environment.etc.hilum-disk.text = config.mainDisk;
     }
-- 
cgit v1.2.3