Make config.machine.firewall an alias of networking.firewall.

machines/CDServer/options.nix

@@ -32,11 +32,10 @@ with lib;
       "openssh"
     ];
     firewall = {
+      enable = true;
       allowPing = false;
       allowedUDPPorts = [ 22 80 443 ];
       allowedTCPPorts = [ 80 443 ];
-      allowedUDPPortRanges = [];
-      allowedTCPPortRanges = [];
     };
   };
 }

machines/DavidsServer/options.nix

@@ -34,11 +34,10 @@ with lib;
       { domain = "mail.${base}"; service = "mail"; }
     ]);
     firewall = {
+      enable = true;
       allowPing = false;
       allowedUDPPorts = [ 22 80 443 ];
       allowedTCPPorts = [ 80 443 ];
-      allowedUDPPortRanges = [];
-      allowedTCPPortRanges = [];
     };
   };
 }

machines/Lilim/options.nix

@@ -36,9 +36,8 @@ with lib;
       "cups"
     ];
     firewall = {
+      enable = true;
       allowPing = true;
-      allowedUDPPorts = [];
-      allowedTCPPorts = [];
       allowedUDPPortRanges = [ { from = 1714; to = 1764; } ];
       allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
     };

machines/Ophanim/options.nix

@@ -43,11 +43,10 @@ with lib;
       { domain = "git.${base}"; service = "gitea"; }
     ]);
     firewall = {
+      enable = true;
       allowPing = false;
       allowedUDPPorts = [ 22 80 443 ];
-      allowedTCPPorts = [ 80 443 ]; # 5222 5269 ];
-      allowedUDPPortRanges = [];
-      allowedTCPPortRanges = [];
+      allowedTCPPorts = [ 80 443 ];
     };
   };
   config.services.mailman3 = {