Lithospherical/nix-config
1
0
Fork 0
forked from jan-leila/nix-config
Code Pull requests Activity

feat: fixed more missing datasets

Browse source
This commit is contained in:
Leyla Becker 2026-03-07 14:33:08 -06:00
parent 1145703cfe
commit 2f7bbf3e1c
5 changed files with 65 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/nixos-modules/storage/storage.nix
View file

@ -153,7 +153,7 @@ in {
config.storage.datasets.replicate)
];
})
(lib.mkIf (config.storage.zfs.enable && !config.storage.impermanence.enable) {
(lib.mkIf (config.storage.zfs.enable && !config.storage.impermanence.enable && config.storage.generateBase) {
storage.datasets = {
# Base organizational datasets (only needed when impermanence is disabled)
local = {

8
modules/nixos-modules/storage/zfs.nix
View file

@ -9,6 +9,12 @@ args @ {
# Hash function for disk names (max 27 chars to fit GPT limitations)
hashDisk = drive: (builtins.substring 0 27 (builtins.hashString "sha256" drive));
# Map "stripe" to "" for disko compatibility (disko uses "" for stripe mode)
diskoPoolMode =
if config.storage.zfs.pool.mode == "stripe"
then ""
else config.storage.zfs.pool.mode;
# Helper to flatten vdevs into list of devices with names
allVdevDevices = lib.lists.flatten (builtins.map (
vdev:
@ -260,7 +266,7 @@ in {
type = "topology";
vdev =
builtins.map (vdev: {
mode = config.storage.zfs.pool.mode;
mode = diskoPoolMode;
members = builtins.map (device: hashDisk device.device) vdev;
})
config.storage.zfs.pool.vdevs;