From 35f03cf90f840d9c594069a8c89531259f5b4d8d Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Thu, 6 Feb 2025 15:22:21 +0100 Subject: [PATCH] core/users: conditionally enable user options We don't want to create extra groups on the server user, and we don't wanna setup hjem for it either. --- modules/core/users.nix | 43 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/modules/core/users.nix b/modules/core/users.nix index e067604..ed82d92 100644 --- a/modules/core/users.nix +++ b/modules/core/users.nix @@ -3,30 +3,31 @@ config, ... }: let + inherit (lib) mkIf; inherit (config.local.systemVars) username; + inherit (config.local.homeVars) fullName; + inherit (config.local.profiles) desktop; in { - config = lib.mkIf (!config.local.profiles.server.enable) { - users.users.${config.local.systemVars.username} = { - isNormalUser = true; - description = config.local.homeVars.fullName or "User"; - extraGroups = [ - "networkmanager" - "audio" - "video" - "wheel" - "plugdev" - ]; - }; + users.users.${username} = { + isNormalUser = true; + description = fullName; + extraGroups = mkIf desktop.enable [ + "networkmanager" + "audio" + "video" + "wheel" + "plugdev" + ]; + }; - hjem = { - clobberByDefault = true; - users.${username} = { - enable = true; - directory = "/home/${username}"; - user = "${username}"; - environment = { - forceOverride = true; - }; + hjem = mkIf desktop.enable { + clobberByDefault = true; + users.${username} = { + enable = true; + directory = "/home/${username}"; + user = "${username}"; + environment = { + forceOverride = true; }; }; };