From 70f702c6fd33454aebc4a266789fc5bf7e77e960 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Sat, 20 Dec 2025 07:49:56 -0600 Subject: age + other various changes --- modules/user/nixos/default.nix | 4 +++- modules/user/options.nix | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'modules/user') diff --git a/modules/user/nixos/default.nix b/modules/user/nixos/default.nix index 05afe37..0257198 100644 --- a/modules/user/nixos/default.nix +++ b/modules/user/nixos/default.nix @@ -1,5 +1,6 @@ { config, + hostname, lib, ... }: let @@ -9,9 +10,10 @@ in { isNormalUser = true; description = cfg.name; extraGroups = ["networkmanager" "pipewire" "disks" "input" "video" "dialout" "kvm"] ++ (lib.optional cfg.isAdmin "wheel"); - hashedPassword = cfg.password; + hashedPasswordFile = config.age.secrets."${cfg.name}@${hostname}-passwd".path; }; security.sudo-rs.enable = true; + services.userborn.enable = true; time.timeZone = "America/Chicago"; diff --git a/modules/user/options.nix b/modules/user/options.nix index f5c7a5f..1024494 100644 --- a/modules/user/options.nix +++ b/modules/user/options.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: let +{lib, ...}: let inherit (lib) mkOption types; in { options = { @@ -10,10 +6,6 @@ in { name = mkOption { type = types.str; }; - password = mkOption { - type = types.str; - description = "hashed password for user"; - }; isAdmin = mkOption { type = types.bool; default = true; -- cgit v1.3.1