diff options
| author | ene <ene@sils.li> | 2023-02-21 08:00:54 +0100 |
|---|---|---|
| committer | ene <ene@sils.li> | 2023-02-21 08:00:54 +0100 |
| commit | ee55bf0927f47a5ad5c9d60c6b072b827293a420 (patch) | |
| tree | caa52999a525bdd4e131e25dae240d7520582171 | |
| parent | Docs(todo): Update todo with gpg (diff) | |
| download | nixos-config-ee55bf0927f47a5ad5c9d60c6b072b827293a420.tar.gz nixos-config-ee55bf0927f47a5ad5c9d60c6b072b827293a420.zip | |
Fix(impermanence): Rework the imports
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 5 | ||||
| -rw-r--r-- | home-manager/default.nix | 3 | ||||
| -rw-r--r-- | home-manager/impermanence/default.nix | 4 | ||||
| -rw-r--r-- | system/impermanence/default.nix | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index d10d2570..96fb07bf 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -32,7 +32,10 @@ defaultModules = [ inputs.agenix.nixosModules.default - inputs.home-manager.nixosModules.home-manager + # inputs.home-manager.nixosModules.home-manager + (import "${inputs.home-manager}/nixos") + + # inputs.impermanence.nixosModules.home-manager.impermanence homeManagerConfig ]; in { diff --git a/home-manager/default.nix b/home-manager/default.nix index bdbf50a6..3783411c 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -16,7 +16,8 @@ dataHome = "${homeDirectory}/.local/share"; in { imports = [ - inputs.impermanence.nixosModules.home-manager.impermanence + # inputs.impermanence.nixosModules.home-manager.impermanence + "${impermanence}/home-manager.nix" ./impermanence ./packages ./config diff --git a/home-manager/impermanence/default.nix b/home-manager/impermanence/default.nix index 7a542ffa..e8226ae5 100644 --- a/home-manager/impermanence/default.nix +++ b/home-manager/impermanence/default.nix @@ -4,9 +4,7 @@ impermanence, ... }: { - # TODO use this instead of the root config - - nixosConfig.home.persistence."/srv/home/soispha" = { + home.persistence."/srv/home/soispha" = { allowOther = true; directories = [ ".local/share" diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix index 1d330fd9..1457530d 100644 --- a/system/impermanence/default.nix +++ b/system/impermanence/default.nix @@ -1,6 +1,7 @@ {impermanence, ...}: { imports = [ - impermanence.nixosModules.impermanence + # impermanence.nixosModules.impermanence + "${impermanence}/nixos.nix" ]; environment.persistence = { |