From 5ec7ee21e036f7bc1cbdec714271c619cb3fdb3d Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 27 Oct 2024 20:12:19 -0400 Subject: modules: restructure (#487) * seth: remove unused pkgs * modules: restructure from archetypes back to profiles make less actual modules for everything use lib.mkDefault like it's supposed to move mixins out of server * nixos/resolved: use modern options --- modules/nixos/traits/secrets.nix | 50 +++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 8 deletions(-) (limited to 'modules/nixos/traits/secrets.nix') diff --git a/modules/nixos/traits/secrets.nix b/modules/nixos/traits/secrets.nix index 6624ef8..d7f4e60 100644 --- a/modules/nixos/traits/secrets.nix +++ b/modules/nixos/traits/secrets.nix @@ -2,6 +2,7 @@ config, lib, inputs, + secretsDir, ... }: let @@ -10,17 +11,50 @@ in { options.traits.secrets = { enable = lib.mkEnableOption "secrets management"; - }; - - imports = [ inputs.agenix.nixosModules.default ]; - config = lib.mkIf cfg.enable { - _module.args = { - secretsDir = inputs.self + "/secrets/${config.networking.hostName}"; + rootUser = lib.mkEnableOption "manage secrets for root user" // { + default = true; }; - age = { - identityPaths = [ "/etc/age/key" ]; + hostUser = lib.mkEnableOption "manager secrets for host user (see `profiles.server.hostUser`)" // { + default = config.profiles.server.hostUser; + defaultText = "config.profiles.server.hostUser"; }; }; + + imports = [ inputs.agenix.nixosModules.default ]; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + _module.args = { + secretsDir = inputs.self + "/secrets/${config.networking.hostName}"; + }; + + age = { + identityPaths = [ "/etc/age/key" ]; + }; + } + + (lib.mkIf cfg.rootUser { + age.secrets = { + rootPassword.file = secretsDir + "/rootPassword.age"; + }; + + users.users.root = { + hashedPasswordFile = config.age.secrets.rootPassword.path; + }; + }) + + (lib.mkIf (config.profiles.server.enable && cfg.hostUser) { + age.secrets = { + userPassword.file = secretsDir + "/userPassword.age"; + }; + + users.users.${config.networking.hostName} = { + hashedPasswordFile = config.age.secrets.userPassword.path; + }; + }) + ] + ); } -- cgit v1.2.3