From 2c69b70e764a244db0946971170795d388670c32 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 25 May 2024 20:17:22 -0400 Subject: modules: use individual files for user traits --- modules/nixos/traits/default.nix | 2 +- modules/nixos/traits/users.nix | 30 ------------------------------ modules/nixos/traits/users/default.nix | 5 +++++ modules/nixos/traits/users/seth.nix | 28 ++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 31 deletions(-) delete mode 100644 modules/nixos/traits/users.nix create mode 100644 modules/nixos/traits/users/default.nix create mode 100644 modules/nixos/traits/users/seth.nix (limited to 'modules/nixos/traits') diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix index 1a69edb..7f03a58 100644 --- a/modules/nixos/traits/default.nix +++ b/modules/nixos/traits/default.nix @@ -7,7 +7,7 @@ ./nvidia.nix ./secrets.nix ./tailscale.nix - ./users.nix + ./users ./zram.nix ]; } diff --git a/modules/nixos/traits/users.nix b/modules/nixos/traits/users.nix deleted file mode 100644 index 2802901..0000000 --- a/modules/nixos/traits/users.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - secretsDir, - ... -}: let - cfg = config.traits.users; -in { - options.traits.users = { - seth = { - manageSecrets = - lib.mkEnableOption "automatic secrets management" - // { - default = config.traits.secrets.enable; - }; - }; - }; - - config = lib.mkMerge [ - (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; - }; - }) - ]; -} diff --git a/modules/nixos/traits/users/default.nix b/modules/nixos/traits/users/default.nix new file mode 100644 index 0000000..a81dacf --- /dev/null +++ b/modules/nixos/traits/users/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./seth.nix + ]; +} diff --git a/modules/nixos/traits/users/seth.nix b/modules/nixos/traits/users/seth.nix new file mode 100644 index 0000000..9ebb6c8 --- /dev/null +++ b/modules/nixos/traits/users/seth.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + secretsDir, + ... +}: let + cfg = config.traits.users.seth; +in { + options.traits.users.seth = { + manageSecrets = + lib.mkEnableOption "automatic secrets management" + // { + default = config.traits.secrets.enable; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf (cfg.enable && cfg.manageSecrets) { + age.secrets = { + sethPassword.file = secretsDir + "/sethPassword.age"; + }; + + users.users.seth = { + hashedPasswordFile = lib.mkDefault config.age.secrets.sethPassword.path; + }; + }) + ]; +} -- cgit v1.2.3