From ee786af7dc2646fd141926ae153ab6ecb68065be Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 27 Feb 2024 13:24:08 -0500 Subject: seth: reorganize system level imports --- modules/nixos/traits/users.nix | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/traits/users.nix b/modules/nixos/traits/users.nix index 31d1b9c..de28c00 100644 --- a/modules/nixos/traits/users.nix +++ b/modules/nixos/traits/users.nix @@ -17,16 +17,12 @@ in { default = config.traits.secrets.enable; }; }; - - seth = { - manageSecrets = - lib.mkEnableOption "automatic secrets management" - // { - default = config.traits.secrets.enable; - }; - }; }; + imports = [ + ../../../users/seth/nixos.nix + ]; + config = lib.mkMerge [ (lib.mkIf cfg.hostUser.enable { users.users.${hostName} = { @@ -44,15 +40,5 @@ in { hashedPasswordFile = config.age.secrets.userPassword.path; }; }) - - (lib.mkIf (cfg.seth.enable && cfg.seth.manageSecrets) { - age.secrets = { - sethPassword.file = secretsDir + "/sethPassword.age"; - }; - - users.users.seth = { - hashedPasswordFile = lib.mkDefault config.age.secrets.sethPassword.path; - }; - }) ]; } -- cgit v1.2.3