diff options
| -rw-r--r-- | modules/nixos/base/root.nix | 9 | ||||
| -rw-r--r-- | users/seth/default.nix | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/nixos/base/root.nix b/modules/nixos/base/root.nix index cedd147..ecc5203 100644 --- a/modules/nixos/base/root.nix +++ b/modules/nixos/base/root.nix @@ -5,6 +5,13 @@ }: let cfg = config.base.defaultRoot; inherit (lib) mkDefault mkEnableOption mkIf; + + # yes this is a bad way to detect which option should be used (or exists) + # but i'm lazy. please do not copy this + passwordFile = + if lib.versionAtLeast config.system.stateVersion "23.11" + then "hashedPasswordFile" + else "passwordFile"; in { options.base.defaultRoot.enable = mkEnableOption "default root user"; @@ -13,7 +20,7 @@ in { home = mkDefault "/root"; uid = mkDefault config.ids.uids.root; group = mkDefault "root"; - passwordFile = mkDefault config.age.secrets.rootPassword.path; + "${passwordFile}" = mkDefault config.age.secrets.rootPassword.path; }; }; } diff --git a/users/seth/default.nix b/users/seth/default.nix index f188318..2e7e106 100644 --- a/users/seth/default.nix +++ b/users/seth/default.nix @@ -19,7 +19,7 @@ } (lib.optionalAttrs pkgs.stdenv.isLinux { extraGroups = lib.optional pkgs.stdenv.isLinux "wheel"; isNormalUser = true; - passwordFile = config.age.secrets.sethPassword.path; + hashedPasswordFile = config.age.secrets.sethPassword.path; }); programs.fish.enable = true; |