5 files changed, 4 insertions, 12 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index e8b32d2..e1cd540 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -41,11 +41,7 @@
     nftables.enable = true;
   };
 
-  services.openssh = {
-    openFirewall = true;
-    settings.X11Forwarding = true;
-  };
-
+  services.openssh.settings.X11Forwarding = true;
   services.xserver.videoDrivers = [ "nvidia" ];
 
   #sops = {
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 0e4541d..b9b4e39 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -79,8 +79,6 @@
     #};
   };
 
-  services.openssh.openFirewall = true;
-
   sops = {
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
     defaultSopsFile = ../secrets/darkstar.yaml;
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 67fd037..3812f41 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -43,11 +43,7 @@
     nftables.enable = true;
   };
 
-  services.openssh = {
-    openFirewall = true;
-    settings.X11Forwarding = true;
-  };
-
+  services.openssh.settings.X11Forwarding = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
 
   sops = {
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index e708d0b..73fe489 100644
--- a/hosts/kaitain/default.nix
+++ b/hosts/kaitain/default.nix
@@ -36,6 +36,7 @@
     nftables.enable = true;
   };
 
+  services.openssh.openFirewall = false;
   services.xserver.videoDrivers = lib.mkForce [ "vmware" "virtualbox" "modesetting" ];
 
   system.stateVersion = "23.11";
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 4de8d3f..eb4a22d 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -33,6 +33,7 @@
     nftables.enable = true;
   };
 
+  services.openssh.openFirewall = false;
   services.xserver.videoDrivers = lib.mkForce [ "vmware" "virtualbox" "modesetting" ];
 
   system.stateVersion = "23.11";