From 30ffa5f234c0e4bbd5e4786d30ca76a1b9903d42 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Wed, 11 Mar 2026 18:35:59 -0500
Subject: [PATCH] moved base import

---
 modules/nix-tools/user.nix | 3 ---
 modules/users/john.nix     | 7 +++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix
index 6160603..9ff2826 100644
--- a/modules/nix-tools/user.nix
+++ b/modules/nix-tools/user.nix
@@ -26,9 +26,6 @@
     homeManager."${username}" = {
       home.username = "${username}";
       home.homeDirectory = "/home/${username}";
-      imports = with self.modules.homeManager; [
-        base
-      ];
     };
   };
 }
\ No newline at end of file
diff --git a/modules/users/john.nix b/modules/users/john.nix
index 7457d1c..900eb90 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -17,7 +17,7 @@ in
       ];
     };
 
-    modules = lib.mkMerge [
+    modules = lib.recursiveUpdate
       (inputs.self.factory.user username true)
       {
         #
@@ -41,10 +41,9 @@ in
           programs.git.settings.user.email = email;
 
           imports = with inputs.self.modules.homeManager; [
-            # base
+            base
           ];
         };
-      }
-    ];
+      };
   };
 }