karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor persistence structure

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-05-26 11:47:21 +01:00
parent b631d466ff
commit 19285a264f
48 changed files with 196 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/configs/user/console/android/default.nix
View File

@@ -17,7 +17,7 @@
users.users.${user}.extraGroups = [ "adbusers" ];
environment.persistence."/persist" = {
environment.persistence."/persist/state" = {
"${home}/.local/share/android/adbkey" = { };
"${home}/.local/share/android/adbkey.pub" = { };
};

2
hosts/common/configs/user/console/btop/default.nix
View File

@@ -14,7 +14,7 @@
update_ms = 1000;
proc_tree = true;
cpu_single_graph = true;
disks_filter = "/ /nix /persist /cache";
disks_filter = "/ /nix /persist";
};
};
}

6
hosts/common/configs/user/console/docker/default.nix
View File

@@ -37,14 +37,14 @@ lib.mkMerge [
};
}
(lib.mkIf rootless {
environment.persistence."/persist"."${home}/.local/share/docker" = { };
environment.persistence."/persist/state"."${home}/.local/share/docker" = { };
systemd.user = {
services.docker.after = [
config.environment.persistence."/persist"."${home}/.local/share/docker".mount
config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount
];
sockets.docker.after = [
config.environment.persistence."/persist"."${home}/.local/share/docker".mount
config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount
];
};
})

4
hosts/common/configs/user/console/kubernetes/default.nix
View File

@@ -10,8 +10,8 @@
}:
{
environment.persistence = {
"/persist"."${home}/.kube" = { };
"/cache"."${home}/.kube/cache" = { };
"/persist/user"."${home}/.kube" = { };
"/persist/cache"."${home}/.kube/cache" = { };
};
home-manager.users.${user} = {

4
hosts/common/configs/user/console/nix-direnv/default.nix
View File

@@ -115,7 +115,7 @@
};
environment.persistence = {
"/persist"."${home}/.local/share/direnv/allow" = { };
"/cache"."${home}/.cache/direnv" = { };
"/persist/state"."${home}/.local/share/direnv/allow" = { };
"/persist/cache"."${home}/.cache/direnv" = { };
};
}

2
hosts/common/configs/user/console/nix/default.nix
View File

@@ -4,7 +4,7 @@
}:
{ pkgs, ... }:
{
environment.persistence."/cache"."${home}/.cache/nix" = { };
environment.persistence."/persist/cache"."${home}/.cache/nix" = { };
home-manager.users.${user} = {
home.packages = with pkgs; [ nurl ];

4
hosts/common/configs/user/console/pipewire/default.nix
View File

@@ -4,10 +4,10 @@
}:
{ config, pkgs, ... }:
{
environment.persistence."/persist"."${home}/.local/state/wireplumber" = { };
environment.persistence."/persist/state"."${home}/.local/state/wireplumber" = { };
systemd.user.services.wireplumber.after = [
config.environment.persistence."/persist"."${home}/.local/state/wireplumber".mount
config.environment.persistence."/persist/state"."${home}/.local/state/wireplumber".mount
];
home-manager.users.${user} = {

2
hosts/common/configs/user/console/podman/default.nix
View File

@@ -9,7 +9,7 @@
...
}:
{
environment.persistence."/persist"."${home}/.local/share/containers" = { };
environment.persistence."/persist/state"."${home}/.local/share/containers" = { };
home-manager.users.${user} = {
imports = [ inputs.quadlet-nix.homeManagerModules.quadlet ];

2
hosts/common/configs/user/console/ranger/default.nix
View File

@@ -4,7 +4,7 @@
}:
{ ... }:
{
environment.persistence."/cache"."${home}/.cache/ranger" = { };
environment.persistence."/persist/cache"."${home}/.cache/ranger" = { };
home-manager.users.${user}.programs = {
ranger = {

6
hosts/common/configs/user/console/sops/default.nix
View File

@@ -4,14 +4,14 @@
}:
{ config, inputs, ... }:
{
environment.persistence."/persist"."${home}/.config/sops-nix/key.txt" = { };
environment.persistence."/persist/state"."${home}/.config/sops-nix/key.txt" = { };
home-manager.users.${user} = {
imports = [ inputs.sops-nix.homeManagerModules.sops ];
sops.age.keyFile =
config.environment.persistence."/persist"."${home}/.config/sops-nix/key.txt".source;
config.environment.persistence."/persist/state"."${home}/.config/sops-nix/key.txt".source;
home.sessionVariables.SOPS_AGE_KEY_FILE =
config.environment.persistence."/persist"."${home}/.config/sops-nix/key.txt".source;
config.environment.persistence."/persist/state"."${home}/.config/sops-nix/key.txt".source;
};
}

2
hosts/common/configs/user/console/xdg/default.nix
View File

@@ -4,7 +4,7 @@
}:
{ config, pkgs, ... }:
{
environment.persistence."/persist" = {
environment.persistence."/persist/user" = {
"${home}/Desktop" = { };
"${home}/Documents" = { };
"${home}/Downloads" = { };

2
hosts/common/configs/user/console/zsh/default.nix
View File

@@ -5,7 +5,7 @@
{ config, pkgs, ... }:
{
environment = {
persistence."/persist"."${home}/.local/share/zsh" = { };
persistence."/persist/state"."${home}/.local/share/zsh" = { };
# If we set this under home-manager.users.${user}.home.sessionVariables,
# it runs too late in the init process and zsh fails.
sessionVariables.ZDOTDIR = "$HOME/.config/zsh";