From 7a5300b6a28aa663f93dd17bad3205f27dc50b44 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sat, 23 Nov 2024 09:41:40 -0500
Subject: [PATCH] Infini-DL360/disks: clean up using new disko lib functions

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

diff --git a/hosts/Infini-DL360/disks.nix b/hosts/Infini-DL360/disks.nix
index 505a0be..efbe1dd 100644
--- a/hosts/Infini-DL360/disks.nix
+++ b/hosts/Infini-DL360/disks.nix
@@ -1,10 +1,5 @@
 { pkgs, lib, ... }:
 with lib.our.disko;
-let
-  inherit (builtins) mapAttrs;
-  inherit (lib) genAttrs flip;
-  mountOptions = defaultMountOptions;
-in
 {
   boot.kernelPackages = pkgs.linuxPackages;
 
@@ -33,7 +28,7 @@ in
       hdd4 = mkZDisk "wwn-0x5000c5004d30f464" "zhdd";
       hdd5 = mkZDisk "wwn-0x5000c5004d30dc88" "zhdd";
     };
-    zpool = mapAttrs mkZPool {
+    zpool = mkZPools {
       zssd = {
         datasets = {
           nix = mkZfs "/nix" { };
@@ -48,7 +43,7 @@ in
     };
   };
 
-  fileSystems = flip genAttrs (_: { neededForBoot = true; }) [
+  fileSystems = markNeededForBoot [
     "/persist"
     "/storage"
     "/etc/ssh"