diff --git a/clanModules/root-password.nix b/clanModules/root-password.nix index e5800192..487d8310 100644 --- a/clanModules/root-password.nix +++ b/clanModules/root-password.nix @@ -1,11 +1,12 @@ { pkgs, config, ... }: { users.mutableUsers = false; - users.extraUsers.root.hashedPasswordFile = "/run/secrets-for-users/passwordHash"; - sops.secrets."${config.clanCore.machineName}-passwordHash".neededForUsers = true; - clanCore.facts.services.password = { + users.users.root.hashedPasswordFile = + config.clanCore.facts.services.root-password.secret.password-hash.path; + sops.secrets."${config.clanCore.machineName}-password-hash".neededForUsers = true; + clanCore.facts.services.root-password = { secret.password = { }; - secret.passwordHash = { }; + secret.password-hash = { }; generator.path = with pkgs; [ coreutils xkcdpass @@ -13,7 +14,7 @@ ]; generator.script = '' xkcdpass --numwords 3 --delimiter - --count 1 > $secrets/password - cat $secrets/password | mkpasswd -s -m sha-512 > $secrets/passwordHash + cat $secrets/password | mkpasswd -s -m sha-512 > $secrets/password-hash ''; }; }