From 92067f8b69bc6bebe6cb1cd0b77d4e2299742e3e Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sun, 6 Jul 2025 23:54:22 -0500
Subject: [PATCH] using mkMerge now

---
 flake.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index f99973b..1c42b8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,14 +56,17 @@
           inputs.home-manager.nixosModules.default
         ];
         nix.settings.trusted-users = [ "root" "@wheel" ];
-        users.users.${config.user} = {
-          isNormalUser = true;
-          description = "John Lancaster";
-          extraGroups = []
-          ++ lib.optionals config.root [ "wheel" ]
-          ++ lib.optionals config.docker [ "docker" ]
-          ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ];
-        } // userOptions config;
+        users.users.${config.user} = lib.mkMerge [
+          {
+            isNormalUser = true;
+            description = "John Lancaster";
+            extraGroups = []
+            ++ lib.optionals config.root [ "wheel" ]
+            ++ lib.optionals config.docker [ "docker" ]
+            ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ];
+          }
+          (userOptions config)
+        ];
 
         users.users.root = lib.mkIf config.root (userOptions config);
         security.sudo-rs = lib.mkIf config.root {