Infini-DL360/disks: clean up using new disko lib functions
This commit is contained in:
parent
870894841f
commit
7a5300b6a2
1 changed files with 2 additions and 7 deletions
|
@ -1,10 +1,5 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
with lib.our.disko;
|
with lib.our.disko;
|
||||||
let
|
|
||||||
inherit (builtins) mapAttrs;
|
|
||||||
inherit (lib) genAttrs flip;
|
|
||||||
mountOptions = defaultMountOptions;
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
boot.kernelPackages = pkgs.linuxPackages;
|
boot.kernelPackages = pkgs.linuxPackages;
|
||||||
|
|
||||||
|
@ -33,7 +28,7 @@ in
|
||||||
hdd4 = mkZDisk "wwn-0x5000c5004d30f464" "zhdd";
|
hdd4 = mkZDisk "wwn-0x5000c5004d30f464" "zhdd";
|
||||||
hdd5 = mkZDisk "wwn-0x5000c5004d30dc88" "zhdd";
|
hdd5 = mkZDisk "wwn-0x5000c5004d30dc88" "zhdd";
|
||||||
};
|
};
|
||||||
zpool = mapAttrs mkZPool {
|
zpool = mkZPools {
|
||||||
zssd = {
|
zssd = {
|
||||||
datasets = {
|
datasets = {
|
||||||
nix = mkZfs "/nix" { };
|
nix = mkZfs "/nix" { };
|
||||||
|
@ -48,7 +43,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = flip genAttrs (_: { neededForBoot = true; }) [
|
fileSystems = markNeededForBoot [
|
||||||
"/persist"
|
"/persist"
|
||||||
"/storage"
|
"/storage"
|
||||||
"/etc/ssh"
|
"/etc/ssh"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue