From 5731f191f71c3aae4b737697385b427e025db6e6 Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Wed, 22 Apr 2026 21:59:17 -0500
Subject: [PATCH] ssh for laptop test

---
 modules/hosts/laptop/configuration.nix |  3 +++
 modules/users/nathan/nathan.nix        | 29 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/modules/hosts/laptop/configuration.nix b/modules/hosts/laptop/configuration.nix
index e633155..cfcb611 100644
--- a/modules/hosts/laptop/configuration.nix
+++ b/modules/hosts/laptop/configuration.nix
@@ -15,6 +15,7 @@
             steam
             avahi
             netbird
+            openssh
         ];
 
         config = {
@@ -87,6 +88,8 @@
                 dhcpcd.enable = false;
             };
 
+            services.openssh.openFirewall = false;
+
 
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
 
diff --git a/modules/users/nathan/nathan.nix b/modules/users/nathan/nathan.nix
index 78cff49..a0ae597 100644
--- a/modules/users/nathan/nathan.nix
+++ b/modules/users/nathan/nathan.nix
@@ -1,6 +1,11 @@
 { self, inputs, ... }: {
 
-    flake.nixosModules.user-nathan = { config, lib, pkgs, ... }: {
+    flake.nixosModules.user-nathan = { config, lib, pkgs, ... }: let
+                laptop = [ "laptop" ];
+                homebox = [ "homebox" ];
+                #both = laptop ++ homebox;
+                useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
+            in {
 
         config = {
 
@@ -12,21 +17,23 @@
                 isNormalUser = lib.mkDefault true;
 #hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
                 extraGroups = [ "networkmanager" "docker" "libvirtd" ];
-                openssh.authorizedKeys.keys = [
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
-                    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCM7ZgIu4+ntHZbzo9iQPq5pUt7AhpOnfvvI0lWDgO4CgtkPGvyFrDnW87wjAKGKYkgKeHWHIkwq2hkEDqlPD+7xxtPpwzfyo7ZS23xlP31rL14HcG21jGHgx9SO7RmGDHHylu4PwJzz/KX59hcVmpSSV4hgB/mYA9UKe6VHv39X4y3HsjmiHwNBOKXltG4V+VkxOZD6HcZ62sgkyDTaqDpE7p+q8vHPbm6dVTKC9cMjtJmjB5EesMGKcEAy3VN2tA9M0EndtaLcBKM39vDXGpBsjURYZTu7NbQnncnO7L8kVL0nT4vA/d4mCjB51dPoXIcxn1ise0TOb9G7TxMbBQQO5YMOpiB2iuZRRvB3sYoKwbO8YfSxZi0EhvLcxkF9GBFw+pWPl0p0D2fPBbW88YQfEpoAt2EWvEu/pgaMJsTHpgaIuDwPLVQmDciX4MRoi324oElGSK8yN0P8IaCHhFchuehLBWvTi34Qot0GpnxeTzmlLzImICO9Yq0I7dk2rk= nathan@rpi-3dp"
+                openssh.authorizedKeys.keys = lib.mkMerge [
+                    (useWith homebox [
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
+                        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCM7ZgIu4+ntHZbzo9iQPq5pUt7AhpOnfvvI0lWDgO4CgtkPGvyFrDnW87wjAKGKYkgKeHWHIkwq2hkEDqlPD+7xxtPpwzfyo7ZS23xlP31rL14HcG21jGHgx9SO7RmGDHHylu4PwJzz/KX59hcVmpSSV4hgB/mYA9UKe6VHv39X4y3HsjmiHwNBOKXltG4V+VkxOZD6HcZ62sgkyDTaqDpE7p+q8vHPbm6dVTKC9cMjtJmjB5EesMGKcEAy3VN2tA9M0EndtaLcBKM39vDXGpBsjURYZTu7NbQnncnO7L8kVL0nT4vA/d4mCjB51dPoXIcxn1ise0TOb9G7TxMbBQQO5YMOpiB2iuZRRvB3sYoKwbO8YfSxZi0EhvLcxkF9GBFw+pWPl0p0D2fPBbW88YQfEpoAt2EWvEu/pgaMJsTHpgaIuDwPLVQmDciX4MRoi324oElGSK8yN0P8IaCHhFchuehLBWvTi34Qot0GpnxeTzmlLzImICO9Yq0I7dk2rk= nathan@rpi-3dp"
+                    ])
+
+                    (useWith laptop [
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnUhN2uHwAJF/SLRX3wlGRmfhV3zpP88JQAYB+gh8jW nathan@localhost"
+                    ])
                 ];
+
                 packages = lib.mkIf (false) [ pkgs.home-manager ];
 
             };
 
-            home-manager.users.nathan = with self.homeModules; let
-                laptop = [ "laptop" ];
-                #homebox = [ "homebox" ];
-                #both = laptop ++ homebox;
-                useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
-            in lib.mkMerge [
+            home-manager.users.nathan = with self.homeModules; lib.mkMerge [
                 self.homeModules.nathan
                 (useWith laptop nathan-aurora)
                 (useWith laptop nathan-firefox)