From bb141b7a715e94d263a5da719c7bd8f4b1ce2917 Mon Sep 17 00:00:00 2001
From: Jermeiah S <owner@arouzing.xyz>
Date: Thu, 19 Jun 2025 15:52:56 -0400
Subject: [PATCH] fix: kuma and improve deployment logging

---
 .../nixos/observer-tofu/default.nix           |  1 +
 configurations/nixos/tofu/default.nix         |  3 +++
 modules/flake/deploy.nix                      |  4 +++-
 modules/nixos/common/ssh.nix                  | 21 ++++++++++++-------
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/configurations/nixos/observer-tofu/default.nix b/configurations/nixos/observer-tofu/default.nix
index 02e7012..76c6201 100644
--- a/configurations/nixos/observer-tofu/default.nix
+++ b/configurations/nixos/observer-tofu/default.nix
@@ -14,6 +14,7 @@ in
     self.nixosModules.default
     "${modulesPath}/virtualisation/lxc-container.nix"
   ];
+  deploy.address = "200:b938:d405:92df:a6e:1ffd:5213:26b";
   services = {
     tty-ips.enable = true;
     uptime-kuma = {
diff --git a/configurations/nixos/tofu/default.nix b/configurations/nixos/tofu/default.nix
index 74ecfbd..18efd18 100644
--- a/configurations/nixos/tofu/default.nix
+++ b/configurations/nixos/tofu/default.nix
@@ -16,6 +16,9 @@ in
     self.nixosModules.default
     "${modulesPath}/virtualisation/lxc-container.nix"
   ];
+  deploy = {
+    address = "200:1978:6503:e6f0:2dbe:11fd:74b:ff64";
+  };
   sops.secrets = {
     otfenv = {
       owner = "otf";
diff --git a/modules/flake/deploy.nix b/modules/flake/deploy.nix
index 1b65964..0af10de 100644
--- a/modules/flake/deploy.nix
+++ b/modules/flake/deploy.nix
@@ -14,9 +14,11 @@ let
       # inherit (self.hosts.${hostName}) address hostPlatform remoteBuild;
       # inherit (deploy-rs.lib.${hostPlatform}) activate;
       system = self.nixosConfigurations."${hostName}".pkgs.system;
+      address = self.nixosConfigurations."${hostName}".config.deploy.address;
     in
     {
-      hostname = hostName;
+      # inherit address;
+      hostname = address;
       profiles.system.path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.${hostName};
     };
 in
diff --git a/modules/nixos/common/ssh.nix b/modules/nixos/common/ssh.nix
index 28b196f..8d7f703 100644
--- a/modules/nixos/common/ssh.nix
+++ b/modules/nixos/common/ssh.nix
@@ -1,10 +1,17 @@
-_: {
-  services.openssh.enable = true;
-  security = {
-    sudo.execWheelOnly = true;
-    pam = {
-      sshAgentAuth.enable = true;
-      services.sudo.sshAgentAuth = true;
+{ lib, config, ... }:
+{
+  options.deploy.address = lib.mkOption {
+    type = lib.types.str;
+    default = config.networking.hostName;
+  };
+  config = {
+    services.openssh.enable = true;
+    security = {
+      sudo.execWheelOnly = true;
+      pam = {
+        sshAgentAuth.enable = true;
+        services.sudo.sshAgentAuth = true;
+      };
     };
   };
 }