Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Infini-DL360: refactor disks again

Browse source
This commit is contained in:
Infinidoge 2024-05-05 10:16:30 -04:00
parent 1fa24aefcd
commit 2c4fdfd222
No known key found for this signature in database
2 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hosts/Infini-DL360/default.nix
View file

@ -11,7 +11,6 @@
modules = { modules = {
boot.grub.enable = true; boot.grub.enable = true;
boot.grub.efiSysMountPoint = "/boot";
boot.timeout = 5; boot.timeout = 5;
hardware.form.server = true; hardware.form.server = true;
}; };

36
hosts/Infini-DL360/disks.nix
View file

@ -2,38 +2,24 @@
with lib.our.disko; with lib.our.disko;
let let
inherit (builtins) mapAttrs; inherit (builtins) mapAttrs;
inherit (lib) genAttrs flip;
mountOptions = defaultMountOptions; mountOptions = defaultMountOptions;
in in
{ {
boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
persist.directories = [ "/etc/ssh" ];
disko.devices = { disko.devices = {
nodev."/" = { nodev."/" = mkTmpfs "64G";
fsType = "tmpfs";
mountOptions = mountOptions ++ [
"size=64G"
"mode=755"
];
};
disk = { disk = {
lun = mkDisk "usb-HP_iLO_LUN_01_Media_0_000002660A01-0:1" { lun = mkDisk "usb-HP_iLO_LUN_01_Media_0_000002660A01-0:1" {
partitions = { partitions = {
boot = { boot = mkESP "64M" "/boot/efi";
size = "256M"; store = mkBtrfsPart "100%" "/media/store" {
type = "EF00"; subvolumes = mkBtrfsSubvols {
content = { "/boot" = { };
type = "filesystem"; "/etc/ssh" = { };
format = "vfat";
mountpoint = "/boot";
inherit mountOptions;
}; };
}; };
# Keystore partition?
#keystore = {
# size = "100%";
#};
}; };
}; };
ssd1 = mkZDisk "wwn-0x50026b728203a6fb" "zssd"; ssd1 = mkZDisk "wwn-0x50026b728203a6fb" "zssd";
@ -60,7 +46,9 @@ in
}; };
}; };
fileSystems."/persist".neededForBoot = true; fileSystems = flip genAttrs (_: { neededForBoot = true; }) [
fileSystems."/storage".neededForBoot = true; "/persist"
fileSystems."/etc/ssh".neededForBoot = true; "/storage"
"/etc/ssh"
];
} }