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

storage-refactor #9

Merged
jan-leila merged 58 commits from storage-refactor into main 2026-03-12 01:16:36 +00:00
Conversation 0 Commits 58 Files changed 127 +44 -40
36 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 16089e0371 - Show all commits

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

@ -4,7 +4,7 @@
... ...
}: { }: {
config = lib.mkIf (config.impermanence.enable) { config = lib.mkIf (config.impermanence.enable) {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"desktop" "desktop"
"downloads" "downloads"

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

@ -12,6 +12,14 @@ in {
type = lib.types.bool; type = lib.types.bool;
default = true; default = true;
}; };
persistencePath = lib.mkOption {
type = lib.types.str;
default =
if osConfig.storage.generateBase
then "/persist/replicate/home"
else "/persist";
description = "The base path for user home persistence. The impermanence module will automatically append the user's home directory path. Automatically adapts based on whether the system uses the new dataset layout or the legacy one.";
};
}; };
config = lib.mkMerge [ config = lib.mkMerge [
@ -26,11 +34,7 @@ in {
# If impermanence is not enabled for this user but system impermanence is enabled, # If impermanence is not enabled for this user but system impermanence is enabled,
# persist the entire home directory as fallback # persist the entire home directory as fallback
(lib.mkIf (osConfig.storage.impermanence.enable && !cfg.enable && cfg.fallbackPersistence.enable) { (lib.mkIf (osConfig.storage.impermanence.enable && !cfg.enable && cfg.fallbackPersistence.enable) {
home.persistence."${ home.persistence."${cfg.persistencePath}" = {
if osConfig.storage.generateBase
then "/persist/replicate/home"
else "/persist/home/${config.home.username}"
}" = {
directories = ["."]; directories = ["."];
allowOther = true; allowOther = true;
}; };

2
modules/home-manager-modules/openssh.nix
View file

@ -96,7 +96,7 @@
} }
) )
(lib.mkIf config.impermanence.enable { (lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
files = lib.lists.flatten ( files = lib.lists.flatten (
builtins.map (hostKey: [".ssh/${hostKey.path}" ".ssh/${hostKey.path}.pub"]) config.programs.openssh.hostKeys builtins.map (hostKey: [".ssh/${hostKey.path}" ".ssh/${hostKey.path}.pub"]) config.programs.openssh.hostKeys
); );

2
modules/home-manager-modules/programs/android-studio.nix
View file

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/Google/AndroidStudio" "${config.xdg.configHome}/Google/AndroidStudio"
".android" ".android"

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

@ -4,7 +4,7 @@
... ...
}: { }: {
config = lib.mkIf (config.programs.anki.enable && config.impermanence.enable) { config = lib.mkIf (config.programs.anki.enable && config.impermanence.enable) {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
".local/share/Anki2" ".local/share/Anki2"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/Bitwarden" "${config.xdg.configHome}/Bitwarden"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/bruno/" "${config.xdg.configHome}/bruno/"
]; ];

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

@ -12,7 +12,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/calibre" "${config.xdg.configHome}/calibre"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.dataHome}/DaVinciResolve" "${config.xdg.dataHome}/DaVinciResolve"
"${config.xdg.configHome}/blackmagic" "${config.xdg.configHome}/blackmagic"

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.dataHome}/DBeaverData/" "${config.xdg.dataHome}/DBeaverData/"
]; ];

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

@ -6,7 +6,7 @@
config = lib.mkIf config.programs.discord.enable (lib.mkMerge [ config = lib.mkIf config.programs.discord.enable (lib.mkMerge [
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/discord/" "${config.xdg.configHome}/discord/"
]; ];

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

@ -25,7 +25,7 @@
}; };
in { in {
config = lib.mkIf (config.programs.firefox.enable && config.impermanence.enable) { config = lib.mkIf (config.programs.firefox.enable && config.impermanence.enable) {
home.persistence."/persist/replicate/home" = lib.mkMerge ( home.persistence."${config.impermanence.persistencePath}" = lib.mkMerge (
( (
lib.attrsets.mapAttrsToList lib.attrsets.mapAttrsToList
(profile: _: buildProfilePersistence profile) (profile: _: buildProfilePersistence profile)

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/FreeCAD" "${config.xdg.configHome}/FreeCAD"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/GIMP" "${config.xdg.configHome}/GIMP"
]; ];

2
modules/home-manager-modules/programs/idea.nix
View file

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
# configuration # configuration
"${config.xdg.configHome}/JetBrains/" "${config.xdg.configHome}/JetBrains/"

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/inkscape" "${config.xdg.configHome}/inkscape"
]; ];

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

@ -23,7 +23,7 @@ in {
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/kdenliverc" "${config.xdg.configHome}/kdenliverc"
"${config.xdg.dataHome}/kdenlive" "${config.xdg.dataHome}/kdenlive"

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/kritarc" "${config.xdg.configHome}/kritarc"
"${config.xdg.dataHome}/krita" "${config.xdg.dataHome}/krita"

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/libreoffice" "${config.xdg.configHome}/libreoffice"
]; ];

2
modules/home-manager-modules/programs/makemkv.nix
View file

@ -30,7 +30,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
".MakeMKV" ".MakeMKV"
]; ];

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

@ -17,7 +17,7 @@ in {
} }
( (
mkIf config.impermanence.enable { mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/mapillary-uploader" "${config.xdg.configHome}/mapillary-uploader"
"${config.xdg.dataHome}/mapillary-uploader" "${config.xdg.dataHome}/mapillary-uploader"

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

@ -6,7 +6,7 @@
config = lib.mkIf config.programs.obs-studio.enable (lib.mkMerge [ config = lib.mkIf config.programs.obs-studio.enable (lib.mkMerge [
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/obs-studio" "${config.xdg.configHome}/obs-studio"
]; ];

2
modules/home-manager-modules/programs/obsidian.nix
View file

@ -6,7 +6,7 @@
config = lib.mkIf config.programs.obsidian.enable (lib.mkMerge [ config = lib.mkIf config.programs.obsidian.enable (lib.mkMerge [
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/obsidian" "${config.xdg.configHome}/obsidian"
]; ];

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

@ -23,7 +23,7 @@ in {
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/olympus" "${config.xdg.configHome}/olympus"
"${config.xdg.dataHome}/olympus" "${config.xdg.dataHome}/olympus"

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/OpenRGB" "${config.xdg.configHome}/OpenRGB"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/MusicBrainz" "${config.xdg.configHome}/MusicBrainz"
]; ];

2
modules/home-manager-modules/programs/prostudiomasters.nix
View file

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/ProStudioMasters" "${config.xdg.configHome}/ProStudioMasters"
]; ];

2
modules/home-manager-modules/programs/protonvpn.nix
View file

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/protonvpn" "${config.xdg.configHome}/protonvpn"
"${config.xdg.configHome}/Proton" "${config.xdg.configHome}/Proton"

2
modules/home-manager-modules/programs/qbittorrent.nix
View file

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/qBittorrent" "${config.xdg.configHome}/qBittorrent"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/qFlipper" "${config.xdg.configHome}/qFlipper"
]; ];

2
modules/home-manager-modules/programs/signal.nix
View file

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/Signal" "${config.xdg.configHome}/Signal"
]; ];

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

@ -18,7 +18,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
{ {
directory = "${config.xdg.dataHome}/Steam"; directory = "${config.xdg.dataHome}/Steam";

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.dataHome}/torbrowser" "${config.xdg.dataHome}/torbrowser"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/chromium" "${config.xdg.configHome}/chromium"
]; ];

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

@ -16,7 +16,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
"${config.xdg.configHome}/via" "${config.xdg.configHome}/via"
"${config.xdg.dataHome}/via" "${config.xdg.dataHome}/via"

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

@ -17,7 +17,7 @@
} }
( (
lib.mkIf config.impermanence.enable { lib.mkIf config.impermanence.enable {
home.persistence."/persist/replicate/home" = { home.persistence."${config.impermanence.persistencePath}" = {
directories = [ directories = [
{ {
directory = ".vmware"; directory = ".vmware";