From a26814ea6aee992bc6740e9ad46e75c128864484 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Wed, 11 Mar 2026 01:00:52 -0500
Subject: [PATCH] flakeDir

---
 modules/hosts/john-pc-ubuntu.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/hosts/john-pc-ubuntu.nix b/modules/hosts/john-pc-ubuntu.nix
index 7604b92..c4e7331 100644
--- a/modules/hosts/john-pc-ubuntu.nix
+++ b/modules/hosts/john-pc-ubuntu.nix
@@ -3,7 +3,11 @@ let
 	hostname = "john-pc-ubuntu";
 in
 {
-	flake.modules.homeManager."${hostname}" = { pkgs, config, ... }: {
+	flake.modules.homeManager."${hostname}" = { pkgs, config, ... }:
+	let
+		flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+	in
+	{
 		imports = with inputs.self.modules.homeManager; [
 			rebuild
 			zsh
@@ -18,8 +22,7 @@ in
 		home.packages = with pkgs; [
 			nixos-rebuild
 			(writeShellScriptBin "test-push" ''
-				FLAKE_DIR="${config.xdg.configHome}/home-manager/jsl-dendritic"
-				nixos-rebuild switch --flake $FLAKE_DIR#janus --target-host root@fded:fb16:653e:25da:be24:11ff:fea0:753f
+				nixos-rebuild switch --flake ${flakeDir}#janus --target-host root@fded:fb16:653e:25da:be24:11ff:fea0:753f
 			'')
 		];
 		# TODO: Add host-specific settings here:
@@ -31,7 +34,7 @@ in
 		nixpkgs.config.allowUnfree = true;
 		nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
 
-		homeManagerFlakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
+		homeManagerFlakeDir = flakeDir;
 		docker.enable = true;
 		ssh.matchSets = {
 			certs = true;