From ab1e07328e3f57d8d415ed702390167a5c59889e Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 14 Sep 2023 21:00:11 -0500
Subject: [PATCH] Fix being unable to boot laptop

---
 disko.nix |  4 ++--
 nixos.nix | 27 +++++++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/disko.nix b/disko.nix
index 2375eaf..fa1899a 100644
--- a/disko.nix
+++ b/disko.nix
@@ -1,10 +1,10 @@
 {
-  standard = { disks ? [ "/dev/vda" ], ... }: {
+  standard = { disks ? [ "/dev/vda" ], name ? "primary", ... }: {
     # this is my standard partitioning scheme for my machines: an LUKS-encrypted
     # btrfs volume
     disko.devices = {
       disk = {
-        primary = {
+        ${builtins.trace name name} = {
           type = "disk";
           device = builtins.elemAt disks 0;
           content = {
diff --git a/nixos.nix b/nixos.nix
index ee968c8..f7c20cd 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -15,10 +15,10 @@ let
     inputs.home-manager.nixosModules.home-manager
     (daniel system)
   ];
-  disko = scheme: disks: [
+  disko = args @ { scheme, ... }: [
     inputs.disko.nixosModules.disko
-    scheme
-    { _module.args.disks = disks; }
+    self.diskoConfigurations.${scheme}
+    { _module.args = args; }
   ];
   nixosSystem = system: modules: (inputs.nixpkgs.lib.nixosSystem {
     specialArgs = { inherit inputs system; };
@@ -27,19 +27,30 @@ let
       ./nixos/common.nix
     ] ++ modules ++ hms system;
   });
-  diskoNixosSystem = system: scheme: disks: modules: (nixosSystem system ((disko scheme disks) ++ modules));
 in
 {
   # TODO: disko-fy rascal and beefcake?
 
-  beefcake = nixosSystem [
+  beefcake = nixosSystem "x86-64-linux" [
     ./nixos/beefcake.nix
     inputs.api-lyte-dev.nixosModules.x86_64-linux.api-lyte-dev
   ];
 
-  rascal = nixosSystem [ ./nixos/rascal.nix ];
+  rascal = nixosSystem "x86_64-linux" [ ./nixos/rascal.nix ];
 
-  musicbox = diskoNixosSystem "x86_64-linux" self.diskoConfigurations.unencrypted [ "/dev/sda" ] [ ./nixos/musicbox.nix ];
-  thinker = diskoNixosSystem "x86_64-linux" self.diskoConfigurations.standard [ "/dev/nvme0n1" ] [ ./nixos/thinker.nix ];
+  musicbox = nixosSystem "x86_64-linux" (disko {
+      scheme = "unencrypted";
+      disks = ["/dev/sda"];
+    } ++ [
+    ./nixos/musicbox.nix
+  ]);
+
+  thinker = nixosSystem "x86_64-linux" (disko {
+      scheme = "standard";
+      disks = ["/dev/nvme0n1"];
+      name = "vdb";
+    } ++ [
+     ./nixos/thinker.nix
+  ]);
   # dragon = diskoNixosSystem self.diskoConfigurations.standard [ "/dev/disk/by-uuid/asdf" ] [ ./nixos/dragon.nix ];
 }