From 89bbe3d167443aaa618a20f001ae7f45d61fd90b Mon Sep 17 00:00:00 2001
From: Aly Raffauf <achacega@gmail.com>
Date: Fri, 1 Mar 2024 23:53:48 -0500
Subject: [PATCH] moved sh settings to network .nix

---
 network/default.nix      | 24 ++++++++----------------
 network/sshd/default.nix | 13 -------------
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 network/sshd/default.nix

diff --git a/network/default.nix b/network/default.nix
index 36429fec..fdac969c 100644
--- a/network/default.nix
+++ b/network/default.nix
@@ -3,22 +3,9 @@
 {
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
   # Enable tailscale
   services.tailscale.enable = true;
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # Enable avahi.
   services.avahi.enable = true;
   services.avahi.nssmdns = true;
@@ -34,7 +21,12 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+  networking.firewall.allowedTCPPorts = [ 22 ];
 }
\ No newline at end of file
diff --git a/network/sshd/default.nix b/network/sshd/default.nix
deleted file mode 100644
index b6811543..00000000
--- a/network/sshd/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # List services that you want to enable:
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  networking.firewall.allowedTCPPorts = [ 22 ];
-}