From 5084ece692f88c2a0b99660b6c7378ce62f42012 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 17 Dec 2025 21:23:19 +0000
Subject: [PATCH] Fix user merging logic to preserve all fields from users.nix

Co-authored-by: Jyumpp <11142390+Jyumpp@users.noreply.github.com>
---
 hosts/user-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/user-config.nix b/hosts/user-config.nix
index 69b71a7..e0fd70d 100644
--- a/hosts/user-config.nix
+++ b/hosts/user-config.nix
@@ -169,11 +169,11 @@ in
     # External options take precedence over users.nix (which uses lib.mkDefault)
     ugaif.users = lib.mapAttrs (
       name: user:
-      {
+      user
+      // {
         description = lib.mkDefault (user.description or null);
         shell = lib.mkDefault (user.shell or null);
         extraGroups = lib.mkDefault (user.extraGroups or [ ]);
-        external = user.external or null;
       }
       // (externalUserOptions.${name} or { })
     ) accounts;