From 20f72768c5dc585d2b64a0cf90c483335908a1eb Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Tue, 10 Mar 2026 22:18:28 -0500
Subject: [PATCH] ssh module reorg

---
 modules/home-manager/profiles/base.nix |  1 -
 modules/home-manager/programs/ssh.nix  | 26 +++++++++++++-------------
 modules/hosts/janus.nix                |  3 +--
 modules/nixos/lxc.nix                  |  1 +
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/modules/home-manager/profiles/base.nix b/modules/home-manager/profiles/base.nix
index 0d1907e..e979354 100644
--- a/modules/home-manager/profiles/base.nix
+++ b/modules/home-manager/profiles/base.nix
@@ -4,7 +4,6 @@
   {
     imports = with inputs.self.homeModules; [
       rebuild
-      # ssh
       git
       shell-tools
     ];
diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix
index 9641d4f..d0f6ec7 100644
--- a/modules/home-manager/programs/ssh.nix
+++ b/modules/home-manager/programs/ssh.nix
@@ -3,6 +3,19 @@ let
   userName = "john";
 in
 {
+  flake.modules.nixos.ssh = {
+    services.openssh = {
+      enable = true;
+      # require public key authentication for better security
+      settings.PasswordAuthentication = false;
+      settings.KbdInteractiveAuthentication = false;
+    };
+
+    home-manager.sharedModules = with inputs.self.homeModules; [
+      ssh
+    ];
+  };
+
   flake.homeModules.ssh = { pkgs, config, lib, ... }:
   {
     options.ssh = {
@@ -117,17 +130,4 @@ in
       };
     };
   };
-
-  flake.modules.nixos.ssh = {
-    services.openssh = {
-      enable = true;
-      # require public key authentication for better security
-      settings.PasswordAuthentication = false;
-      settings.KbdInteractiveAuthentication = false;
-    };
-
-    home-manager.sharedModules = with inputs.self.homeModules; [
-      ssh
-    ];
-  };
 }
diff --git a/modules/hosts/janus.nix b/modules/hosts/janus.nix
index 29a5449..8190c25 100644
--- a/modules/hosts/janus.nix
+++ b/modules/hosts/janus.nix
@@ -7,13 +7,13 @@ in
   flake.modules.nixos."${hostname}" = { pkgs, ... }: {
     imports = [
       inputs.self.modules.nixos.lxc
+      inputs.home-manager.nixosModules.home-manager
       inputs.self.modules.nixos."${username}"
       # inputs.self.modules.nixos.step-ca
       inputs.self.modules.nixos.docker
     ];
     home-manager.users."${username}" = {
       imports = with inputs.self.homeModules; [
-        ssh
       ];
       docker.enable = true;
       ssh.matchSets = {
@@ -26,7 +26,6 @@ in
   flake.nixosConfigurations."${hostname}" = inputs.nixpkgs.lib.nixosSystem {
     modules = [
       inputs.self.modules.nixos."${hostname}"
-      inputs.home-manager.nixosModules.home-manager
     ];
   };
 }
\ No newline at end of file
diff --git a/modules/nixos/lxc.nix b/modules/nixos/lxc.nix
index 9bfc4d8..186ae99 100644
--- a/modules/nixos/lxc.nix
+++ b/modules/nixos/lxc.nix
@@ -14,6 +14,7 @@
   flake.nixosConfigurations.lxc = inputs.nixpkgs.lib.nixosSystem {
     modules = [
       inputs.self.modules.nixos.lxc
+      inputs.self.modules.nixos.ssh
     ];
   };
 }