From ed5cecd24d494bafad29e48458d43a467b36e2b7 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:50:59 -0500
Subject: [PATCH] import fixes

---
 modules/hosts/janus.nix                             | 5 +++--
 modules/hosts/john-pc-ubuntu.nix                    | 1 +
 modules/nix-tools/user.nix                          | 6 +++---
 modules/{home-manager/programs => services}/ssh.nix | 0
 modules/users/john.nix                              | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)
 rename modules/{home-manager/programs => services}/ssh.nix (100%)

diff --git a/modules/hosts/janus.nix b/modules/hosts/janus.nix
index ccb7d84..f8559a2 100644
--- a/modules/hosts/janus.nix
+++ b/modules/hosts/janus.nix
@@ -13,8 +13,9 @@ in
       inputs.self.modules.nixos.docker
     ];
     home-manager.users."${username}" = {
-      imports = with inputs.self.modules.homeManager; [
-      ];
+      # imports = with inputs.self.modules; [
+      #   homeManager."${username}"
+      # ];
       docker.enable = true;
       ssh.matchSets = {
         certs = true;
diff --git a/modules/hosts/john-pc-ubuntu.nix b/modules/hosts/john-pc-ubuntu.nix
index 041929c..2725cdc 100644
--- a/modules/hosts/john-pc-ubuntu.nix
+++ b/modules/hosts/john-pc-ubuntu.nix
@@ -5,6 +5,7 @@ in
 {
 	flake.modules.homeManager."${hostname}" = { pkgs, config, ... }: {
 		imports = with inputs.self.modules.homeManager; [
+			# base
 			rebuild
 			john
 			desktop
diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix
index 8186eca..8d2e141 100644
--- a/modules/nix-tools/user.nix
+++ b/modules/nix-tools/user.nix
@@ -15,11 +15,8 @@
           "wheel"
         ];
       };
-
-      # Import the corresponding homeManager module for the given username
       home-manager.users."${username}" = {
         imports = [
-          self.modules.homeManager.base
           self.modules.homeManager."${username}"
         ];
       };
@@ -28,6 +25,9 @@
     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/home-manager/programs/ssh.nix b/modules/services/ssh.nix
similarity index 100%
rename from modules/home-manager/programs/ssh.nix
rename to modules/services/ssh.nix
diff --git a/modules/users/john.nix b/modules/users/john.nix
index 32786a6..1c2ed50 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -23,7 +23,6 @@ in
         # https://github.com/Doc-Steve/dendritic-design-with-flake-parts/wiki/Dendritic_Aspects#multi-context-aspect
         nixos."${username}" = { pkgs, ... }: {
           users.users."${username}" = {
-            isNormalUser = true;
             openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
             extraGroups = [ "docker" ];
           };
@@ -36,9 +35,9 @@ in
           programs.git.settings.user.name = "John Lancaster";
           programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
 
-          imports = with inputs.self.modules.homeManager; [
-            base
-          ];
+          # imports = with inputs.self.modules.homeManager; [
+          #   # base
+          # ];
         };
       }
     ];
@@ -48,6 +47,7 @@ in
   flake.homeConfigurations."${username}" = inputs.home-manager.lib.homeManagerConfiguration {
 		pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
 		modules = [
+			inputs.self.modules.homeManager.base
 			inputs.self.modules.homeManager."${username}"
 
       # Include another inline module to set the options created through the jsl-home modules