diff --git a/home/default.nix b/home/default.nix index 96459931..6ce14fac 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,7 +10,6 @@ ./gpg.nix ./helix.nix ./packages.nix - # ./persist.nix ./playerctld.nix ./rofi.nix ./sops.nix diff --git a/home/persist.nix b/home/persist.nix index 319e38bc..6988d6d4 100644 --- a/home/persist.nix +++ b/home/persist.nix @@ -23,12 +23,12 @@ ".config/obsidian" ".config/spotify" ( - lib.optionals + lib.optional config.gaming.enable ".local/share/PrismLauncher" ) ( - lib.optionals + lib.optional config.gaming.enable ".local/share/Steam" ) diff --git a/home/sops.nix b/home/sops.nix index 573ac67e..a0683c4d 100644 --- a/home/sops.nix +++ b/home/sops.nix @@ -3,7 +3,7 @@ sops-nix, ... }: { - # imports = [sops-nix.homeManagerModules.sops]; + imports = [sops-nix.homeManagerModules.sops]; sops = { age.keyFile = "/persist/data${conf.home}/.config/sops/age/keys.txt"; }; diff --git a/home/zsh/.p10k.zsh b/home/zsh/p10k.zsh similarity index 100% rename from home/zsh/.p10k.zsh rename to home/zsh/p10k.zsh diff --git a/system/persistence.nix b/system/persistence.nix index 4fc2c375..f860585b 100644 --- a/system/persistence.nix +++ b/system/persistence.nix @@ -8,7 +8,7 @@ ]; files = []; - # users.${conf.user} = (import ../home/persistence.nix).data; + # users.${conf.user} = (import ../home/persist.nix).data; }; environment.persistence."/persist/cache" = { @@ -25,6 +25,6 @@ "/etc/machine-id" ]; - # users.${conf.user} = (import ../home/persistence.nix).cache; + # users.${conf.user} = (import ../home/persist.nix).cache; }; } diff --git a/system/users.nix b/system/users.nix index 1074e1ac..98b849db 100644 --- a/system/users.nix +++ b/system/users.nix @@ -1,5 +1,4 @@ { - lib, conf, config, ... @@ -18,6 +17,7 @@ extraSpecialArgs = { inherit inputs; conf = conf; + sops-nix = inputs.inputs.sops-nix; }; useGlobalPkgs = true; useUserPackages = true;