From 025d96dbbcc70df7ba5327b476a139a63a9f7b44 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Sat, 26 Nov 2022 10:53:42 +0800
Subject: [PATCH] lib/private: update `mapHomeManagerUser`

---
 lib/private.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/private.nix b/lib/private.nix
index 750d68ad..52863aa5 100644
--- a/lib/private.nix
+++ b/lib/private.nix
@@ -7,19 +7,21 @@ rec {
     let
       homeDirectory = "/home/${user}";
       defaultUserConfig = {
-        extraGroups = [ "wheel" ];
-        createHome = true;
-        home = homeDirectory;
+        extraGroups = lib.mkDefault [ "wheel" ];
+        createHome = lib.mkDefault true;
+        home = lib.mkDefault homeDirectory;
+        isNormalUser = lib.mkForce true;
       };
-      # TODO: Effectively override the option.
-      # We assume all users set with this module are normal users.
-      absoluteOverrides = { isNormalUser = true; };
     in
     {
+      imports = [
+        { users.users."${user}" = defaultUserConfig; }
+      ];
+
       home-manager.users."${user}" = { ... }: {
         imports = [ (getUser "home-manager" user) ];
       };
-      users.users."${user}" = defaultUserConfig // settings // absoluteOverrides;
+      users.users."${user}" = settings;
     };
 
   getSecret = path: ../secrets/${path};