AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: filter out mounpoints from persistance list

Browse Source
This commit is contained in:
Dmitriy Kholkin 2025-03-12 15:41:05 +03:00
parent 07b12c6171
commit 7d5c459e59
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/nixos/filesystems/btrfs.nix
View File

@ -41,6 +41,16 @@ in
{
options.ataraxia.filesystems.btrfs = {
enable = mkEnableOption "Root on btrfs";
mountpoints = mkOption {
type = listOf str;
default = [ ];
description = ''
A list of absolute paths to BTRFS subvolume mountpoints.
These paths will be automatically filtered out from the directories persisted through
persist module to prevent conflicts with BTRFS' native mount management. Any matching entries
in the persistence list will be removed.
'';
};
# Btrfs clean root
eraseOnBoot = {
enable = mkOption {

10
modules/nixos/filesystems/zfs.nix
View File

@ -17,6 +17,16 @@ in
{
options.ataraxia.filesystems.zfs = {
enable = mkEnableOption "Root on zfs";
mountpoints = mkOption {
type = listOf str;
default = [ ];
description = ''
A list of absolute paths to ZFS dataset mountpoints.
These paths will be automatically filtered out from the directories persisted through
persist module to prevent conflicts with ZFS's native mount management. Any matching entries
in the persistence list will be removed.
'';
};
# Zfs clean root
eraseOnBoot = {
enable = mkOption {

24
modules/nixos/persist/default.nix
View File

@ -16,11 +16,19 @@ let
mkOption
nameValuePair
optionalAttrs
pipe
recursiveUpdate
removePrefix
subtractLists
unique
;
inherit (lib.types) listOf path str;
inherit (builtins) concatMap;
cfg = config.persist;
btrfs = config.ataraxia.filesystems.btrfs.mountpoints;
zfs = config.ataraxia.filesystems.zfs.mountpoints;
mountpoints = unique (btrfs ++ zfs);
in
{
imports = [ inputs.impermanence.nixosModules.impermanence ];
@ -79,6 +87,8 @@ in
];
allFiles = takeAll "files" persists;
allDirectories = takeAll "directories" persists;
# Remove btrfs + zfs mountpoints from list of dirs to persist
filteredDirs = subtractLists mountpoints allDirectories;
userPersists = mapAttrs (_: cfg: cfg.persist) (
{ } // optionalAttrs (builtins.hasAttr "home-manager" config) config.home-manager.users
@ -92,10 +102,17 @@ in
];
allHomeFiles = takeAll "files" persists;
allHomeDirectories = takeAll "directories" persists;
# Remove btrfs + zfs mountpoints from list of dirs to persist
home = "/home/${name}";
filteredDirs = pipe allHomeDirectories [
(map (x: "${home}/${x}"))
(xs: subtractLists mountpoints xs)
(map (x: removePrefix home x))
];
in
{
home = "/home/${name}";
directories = allHomeDirectories;
inherit home;
directories = filteredDirs;
files = allHomeFiles;
}
) userPersists;
@ -103,7 +120,7 @@ in
mkIf cfg.enable {
environment.persistence.${cfg.persistRoot} = {
hideMounts = true;
directories = allDirectories;
directories = filteredDirs;
files = allFiles;
users = usersFlatten;
};
@ -146,7 +163,6 @@ in
];
fileSystems.${cfg.persistRoot}.neededForBoot = true;
# TODO: disable some dirs if using zfs
# Persist by default
persist.cache.directories = [
"/var/cache"