From 163daad93da692fc280036b80f29ca9b65c005d4 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 12 Dec 2023 23:08:56 -0500 Subject: flake: update nixpkgs-stable to 23.11 --- modules/nixos/base.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/base.nix b/modules/nixos/base.nix index 361829a..83212fe 100644 --- a/modules/nixos/base.nix +++ b/modules/nixos/base.nix @@ -79,18 +79,11 @@ in { defaultUserShell = pkgs.bash; mutableUsers = false; - users.root = let - # 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 { + users.root = { home = mkDefault "/root"; uid = mkDefault config.ids.uids.root; group = mkDefault "root"; - "${passwordFile}" = mkDefault config.age.secrets.rootPassword.path; + hashedPasswordFile = mkDefault config.age.secrets.rootPassword.path; }; }; } -- cgit v1.2.3