added needed for boot to user persist directories
This commit is contained in:
parent
b6f1704af3
commit
e54981fffc
|
@ -259,7 +259,20 @@ in {
|
||||||
normalUsers)
|
normalUsers)
|
||||||
);
|
);
|
||||||
|
|
||||||
fileSystems.${SOPS_AGE_KEY_DIRECTORY}.neededForBoot = true;
|
fileSystems = lib.mkMerge [
|
||||||
|
{
|
||||||
|
${SOPS_AGE_KEY_DIRECTORY}.neededForBoot = true;
|
||||||
|
}
|
||||||
|
(
|
||||||
|
builtins.listToAttrs (
|
||||||
|
builtins.map (user:
|
||||||
|
lib.attrsets.nameValuePair "/persist/home/${user.name}" {
|
||||||
|
neededForBoot = true;
|
||||||
|
})
|
||||||
|
normalUsers
|
||||||
|
)
|
||||||
|
)
|
||||||
|
];
|
||||||
|
|
||||||
environment.persistence."/persist/system/root" = {
|
environment.persistence."/persist/system/root" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -269,7 +282,8 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
host.storage.pool.extraDatasets = lib.mkMerge [
|
host.storage.pool.extraDatasets = lib.mkMerge (
|
||||||
|
[
|
||||||
{
|
{
|
||||||
# sops age key needs to be available to pre persist for user generation
|
# sops age key needs to be available to pre persist for user generation
|
||||||
"local/system/sops" = {
|
"local/system/sops" = {
|
||||||
|
@ -282,9 +296,8 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
(
|
]
|
||||||
lib.mkMerge
|
++ (
|
||||||
(
|
|
||||||
builtins.map (user: {
|
builtins.map (user: {
|
||||||
"local/home/${user.name}" = {
|
"local/home/${user.name}" = {
|
||||||
type = "zfs_fs";
|
type = "zfs_fs";
|
||||||
|
@ -306,8 +319,7 @@ in {
|
||||||
})
|
})
|
||||||
normalUsers
|
normalUsers
|
||||||
)
|
)
|
||||||
)
|
);
|
||||||
];
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue