From 1baac1f5d8ee9cc3a6dc125f3b80fab483fdbe5d Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 5 May 2024 06:27:58 -0400
Subject: [PATCH] Infini-DL360: fix disko config

---
 hosts/Infini-DL360/disks.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/hosts/Infini-DL360/disks.nix b/hosts/Infini-DL360/disks.nix
index 074023d..325a90f 100644
--- a/hosts/Infini-DL360/disks.nix
+++ b/hosts/Infini-DL360/disks.nix
@@ -1,5 +1,5 @@
 { config, lib, ... }:
-with lib.disko;
+with lib.our.disko;
 let
   inherit (builtins) mapAttrs;
   mountOptions = defaultMountOptions;
@@ -16,10 +16,9 @@ in
       ];
     };
     disk = {
-      lun = "usb-HP_iLO_LUN_01_Media_0_000002660A01-0:1" {
+      lun = mkDisk "usb-HP_iLO_LUN_01_Media_0_000002660A01-0:1" {
         partitions = {
-          ESP = {
-            name = "boot";
+          boot = {
             size = "256M";
             type = "EF00";
             content = {
@@ -46,11 +45,15 @@ in
     };
     zpool = mapAttrs mkZPool {
       zssd = {
-        nix = mkZfs "/nix" {};
-        persist = mkZfs "/persist" {};
+        datasets = {
+          nix = mkZfs "/nix" {};
+          persist = mkZfs "/persist" {};
+        };
       };
       zhdd = {
-        storage = mkZfs "/storage" {};
+        datasets = {
+          storage = mkZfs "/storage" {};
+        };
       };
     };
   };