moved rebuild

modules/home-manager/profiles/base.nix

@@ -3,7 +3,6 @@
   flake.modules.homeManager.base = { pkgs, ... }:
   {
     imports = with inputs.self.modules.homeManager; [
-      rebuild
       git
       shell-tools
     ];

modules/hosts/john-pc-ubuntu.nix

@@ -1,7 +1,11 @@
 { inputs, ... }:
+let
+	hostname = "john-pc-ubuntu";
+in
 {
-	flake.modules.homeManager."john-pc-ubuntu" = { pkgs, config, ... }: {
+	flake.modules.homeManager."${hostname}" = { pkgs, config, ... }: {
 		imports = with inputs.self.modules.homeManager; [
+			rebuild
 			john
 			desktop
 			docker
@@ -21,15 +25,6 @@
 		# - sops secret for `restic_password/john_ubuntu`
 		# - resticprofile profile definition
 		# - zsh RESTIC* session variables
-	};
-
-	flake.homeConfigurations."john-pc-ubuntu" = inputs.home-manager.lib.homeManagerConfiguration {
-		pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
-		modules = [
-			inputs.self.modules.homeManager."john-pc-ubuntu"
-
-      # Include another inline module to set the options created through the jsl-home modules
-      ({ config, ... }: {
 
 		# TODO: make this more restrictive, rather than allowing all unfree packages
 		nixpkgs.config.allowUnfree = true;
@@ -65,7 +60,12 @@
 				};
 			};
 		};
-      })
+	};
+
+	flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+		pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+		modules = with inputs.self.modules; [
+			homeManager."${hostname}"
 		];
 	};
 }

modules/nix-tools/user.nix

@@ -19,6 +19,7 @@
       # Import the corresponding homeManager module for the given username
       home-manager.users."${username}" = {
         imports = [
+          self.modules.homeManager.base
           self.modules.homeManager."${username}"
         ];
       };