From ce55bbc19457602b6de5bd34834d07e708c8df7f Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Tue, 10 Mar 2026 23:39:23 -0500
Subject: [PATCH] moved rebuild

---
 modules/home-manager/profiles/base.nix        |  1 -
 modules/hosts/john-pc-ubuntu.nix              | 84 +++++++++----------
 .../{home-manager => nix-tools}/rebuild.nix   |  0
 modules/nix-tools/user.nix                    |  1 +
 4 files changed, 43 insertions(+), 43 deletions(-)
 rename modules/{home-manager => nix-tools}/rebuild.nix (100%)

diff --git a/modules/home-manager/profiles/base.nix b/modules/home-manager/profiles/base.nix
index f20a369..9293c16 100644
--- a/modules/home-manager/profiles/base.nix
+++ b/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
     ];
diff --git a/modules/hosts/john-pc-ubuntu.nix b/modules/hosts/john-pc-ubuntu.nix
index 88d23fb..041929c 100644
--- a/modules/hosts/john-pc-ubuntu.nix
+++ b/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,51 +25,47 @@
 		# - 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"
+		# TODO: make this more restrictive, rather than allowing all unfree packages
+		nixpkgs.config.allowUnfree = true;
+		nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
 
-      # 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;
-				nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
-
-        homeManagerFlakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
-        docker.enable = true;
-        ssh.matchSets = {
-          certs = true;
-          appdaemon = true;
-          homelab = true;
-					dev = true;
-        };
-				shell.program = "zsh";
-				sops.secrets."restic_password/john_ubuntu" = {
-					path = "${config.xdg.configHome}/resticprofile/password.txt";
-				};
-				programs.resticprofile = {
-					enable= true;
-					profiles = {
-						default = {
-							"inherit" = "base";
-							repository = "rest:https://soteria.john-stream.com/john-ubuntu";
-							cacert = "${config.home.homeDirectory}/.step/certs/root_ca.crt";
-							tls-client-cert = "${config.home.homeDirectory}/.step/certs/mtls.pem";
-							backup = {
-								source = [
-									"${config.xdg.userDirs.documents}"
-									"/conf"
-								];
-								schedule = "*-*-* *:15,30,45:00";
-							};
-						};
+		homeManagerFlakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+		docker.enable = true;
+		ssh.matchSets = {
+			certs = true;
+			appdaemon = true;
+			homelab = true;
+			dev = true;
+		};
+		shell.program = "zsh";
+		sops.secrets."restic_password/john_ubuntu" = {
+			path = "${config.xdg.configHome}/resticprofile/password.txt";
+		};
+		programs.resticprofile = {
+			enable= true;
+			profiles = {
+				default = {
+					"inherit" = "base";
+					repository = "rest:https://soteria.john-stream.com/john-ubuntu";
+					cacert = "${config.home.homeDirectory}/.step/certs/root_ca.crt";
+					tls-client-cert = "${config.home.homeDirectory}/.step/certs/mtls.pem";
+					backup = {
+						source = [
+							"${config.xdg.userDirs.documents}"
+							"/conf"
+						];
+						schedule = "*-*-* *:15,30,45:00";
 					};
 				};
-      })
+			};
+		};
+	};
+
+	flake.homeConfigurations."${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+		pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
+		modules = with inputs.self.modules; [
+			homeManager."${hostname}"
 		];
 	};
 }
diff --git a/modules/home-manager/rebuild.nix b/modules/nix-tools/rebuild.nix
similarity index 100%
rename from modules/home-manager/rebuild.nix
rename to modules/nix-tools/rebuild.nix
diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix
index 99e96b0..8186eca 100644
--- a/modules/nix-tools/user.nix
+++ b/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}"
         ];
       };