jan-leila/nix-config
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

feat: migrated users over to new persistence structure

Browse source
This commit is contained in:
Leyla Becker 2025-11-10 02:38:28 -06:00
parent 37f5e65bd6
commit d06c25f33f
29 changed files with 57 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configurations/home-manager/leyla/default.nix
View file

@ -12,7 +12,7 @@
];
config = {
impermanence.enable = osConfig.host.impermanence.enable;
impermanence.enable = osConfig.storage.impermanence.enable;
# Home Manager needs a bit of information about you and the paths it should
# manage.

1
configurations/home-manager/leyla/impermanence.nix
View file

@ -14,7 +14,6 @@
".bash_history" # keep shell history around
"${config.xdg.dataHome}/recently-used.xbel" # gnome recently viewed files
];
allowOther = true;
};
};
}

5
modules/home-manager-modules/impermanence.nix
View file

@ -18,17 +18,16 @@ in {
(lib.mkIf config.impermanence.enable {
assertions = [
{
assertion = osConfig.host.impermanence.enable;
assertion = osConfig.storage.impermanence.enable;
message = "impermanence can not be enabled for a user when it is not enabled for the system";
}
];
})
# If impermanence is not enabled for this user but system impermanence is enabled,
# persist the entire home directory as fallback
(lib.mkIf (osConfig.host.impermanence.enable && !cfg.enable && cfg.fallbackPersistence.enable) {
(lib.mkIf (osConfig.storage.impermanence.enable && !cfg.enable && cfg.fallbackPersistence.enable) {
home.persistence."/persist/home/${config.home.username}" = {
directories = ["."];
allowOther = true;
};
})
];

4
modules/home-manager-modules/programs/anki.nix
View file

@ -1,15 +1,13 @@
{
lib,
config,
osConfig,
...
}: {
config = lib.mkIf (config.programs.anki.enable && osConfig.host.impermanence.enable) {
config = lib.mkIf (config.programs.anki.enable && config.impermanence.enable) {
home.persistence."/persist${config.home.homeDirectory}" = {
directories = [
"${config.xdg.dataHome}/Anki2/"
];
allowOther = true;
};
};
}

1
modules/home-manager-modules/programs/bitwarden.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/Bitwarden"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/bruno.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/bruno/"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/calibre.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/calibre"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/davinci-resolve.nix
View file

@ -21,7 +21,6 @@
"${config.xdg.dataHome}/DaVinciResolve"
"${config.xdg.configHome}/blackmagic"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/dbeaver.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.dataHome}/DBeaverData/"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/discord.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/discord/"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/firefox.nix
View file

@ -22,7 +22,6 @@
# Extension configuration
".mozilla/firefox/${profile}/extension-settings.json"
];
allowOther = true;
};
in {
config = lib.mkIf (config.programs.firefox.enable && config.impermanence.enable) {

1
modules/home-manager-modules/programs/freecad.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/FreeCAD"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/gimp.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/GIMP"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/inkscape.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/inkscape"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/kdenlive.nix
View file

@ -28,7 +28,6 @@ in {
"${config.xdg.configHome}/kdenliverc"
"${config.xdg.dataHome}/kdenlive"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/krita.nix
View file

@ -21,7 +21,6 @@
"${config.xdg.configHome}/kritarc"
"${config.xdg.dataHome}/krita"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/libreoffice.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/libreoffice"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/mapillary-uploader.nix
View file

@ -22,7 +22,6 @@ in {
"${config.xdg.configHome}/mapillary-uploader"
"${config.xdg.dataHome}/mapillary-uploader"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/obs.nix
View file

@ -10,7 +10,6 @@
directories = [
"${config.xdg.configHome}/obs-studio"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/olympus.nix
View file

@ -28,7 +28,6 @@ in {
"${config.xdg.configHome}/olympus"
"${config.xdg.dataHome}/olympus"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/openrgb.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/OpenRGB"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/picard.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/MusicBrainz"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/qflipper.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/qFlipper"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/steam.nix
View file

@ -25,7 +25,6 @@
method = "symlink";
}
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/tor-browser.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.dataHome}/torbrowser"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/ungoogled-chromium.nix
View file

@ -20,7 +20,6 @@
directories = [
"${config.xdg.configHome}/chromium"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/via.nix
View file

@ -21,7 +21,6 @@
"${config.xdg.configHome}/via"
"${config.xdg.dataHome}/via"
];
allowOther = true;
};
}
)

1
modules/home-manager-modules/programs/vmware-workstation.nix
View file

@ -28,7 +28,6 @@
method = "symlink";
}
];
allowOther = true;
};
}
)

120
modules/nixos-modules/users.nix
View file

@ -400,74 +400,60 @@ in {
};
}
(lib.mkIf config.storage.impermanence.enable (lib.mkMerge [
(lib.mkIf config.storage.zfs.enable {
storage.zfs.datasets."persist/system/sops" = {
type = "zfs_fs";
mount = {
enable = true;
mountPoint = SOPS_AGE_KEY_DIRECTORY;
(lib.mkIf config.storage.zfs.enable (lib.mkMerge [
{
# sops age key needs to be available to pre persist for user generation
storage.zfs.datasets = lib.mkMerge [
{
"local/system/sops" = {
type = "zfs_fs";
mount = {
enable = true;
mountPoint = SOPS_AGE_KEY_DIRECTORY;
};
atime = "off";
relatime = "off";
};
}
# Create ZFS datasets for each normal user
(lib.mkMerge (
builtins.map (user: {
"local/home/${user.name}" = {
type = "zfs_fs";
mount = {
enable = true;
mountPoint = "/home/${user.name}";
};
snapshot.blankSnapshot = true;
};
"persist/home/${user.name}" = {
type = "zfs_fs";
mount = {
enable = true;
mountPoint = "/persist/home/${user.name}";
};
};
})
normalUsers
))
];
# Post resume commands to rollback user home datasets to blank snapshots
boot.initrd.postResumeCommands = lib.mkAfter (
lib.strings.concatLines (builtins.map (user: "zfs rollback -r rpool/local/home/${user.name}@blank")
normalUsers)
);
# Create persist home directories with proper permissions
systemd = {
tmpfiles.rules =
builtins.map (
user: "d /persist/home/${user.name} 700 ${user.name} ${user.name} -"
)
normalUsers;
};
atime = "off";
relatime = "off";
};
})
}
]))
]))
# (lib.mkIf config.host.impermanence.enable {
# boot.initrd.postResumeCommands = lib.mkAfter (
# lib.strings.concatLines (builtins.map (user: "zfs rollback -r rpool/local/home/${user.name}@blank")
# normalUsers)
# );
# systemd = {
# tmpfiles.rules =
# builtins.map (
# user: "d /persist/home/${user.name} 700 ${user.name} ${user.name} -"
# )
# normalUsers;
# };
# fileSystems = lib.mkMerge [
# (
# builtins.listToAttrs (
# builtins.map (user:
# lib.attrsets.nameValuePair "/persist/home/${user.name}" {
# neededForBoot = true;
# })
# normalUsers
# )
# )
# (
# builtins.listToAttrs (
# builtins.map (user:
# lib.attrsets.nameValuePair "/home/${user.name}" {
# neededForBoot = true;
# })
# normalUsers
# )
# )
# ];
# host.storage.pool.extraDatasets = lib.mkMerge (
# (
# builtins.map (user: {
# "local/home/${user.name}" = {
# type = "zfs_fs";
# mountpoint = "/home/${user.name}";
# options = {
# canmount = "on";
# };
# postCreateHook = ''
# zfs snapshot rpool/local/home/${user.name}@blank
# '';
# };
# "persist/home/${user.name}" = {
# type = "zfs_fs";
# mountpoint = "/persist/home/${user.name}";
# };
# })
# normalUsers
# )
# );
# })
];
}