properly refactored flame

modules/modules.nix

@@ -15,12 +15,7 @@ let
     config.my.servers.drpp.enable
     config.my.servers.plex-discord-bot.enable
   ];
-  filterNames =
-    file:
-    file != "base.nix"
-    && file != "setup.nix"
-    && file != "librewolf.nix"
-    && file != "server-factory.nix";
+  filterNames = file: file != "base.nix" && file != "setup.nix" && file != "librewolf.nix";
   autoImport =
     dir:
     builtins.readDir ./${dir}
@@ -36,11 +31,10 @@ in
     ++ autoImport "servers"
     ++ autoImport "services"
     ++ autoImport "shell"
+    ++ autoImport "network"
     ++ [
       ./nix/build.nix
       ./users/nixremote.nix
-      ./network/firewall.nix
-      ./network/nginx.nix
     ];
   options.my = {
     localhost = lib.mkOption {
@@ -154,16 +148,5 @@ in
       recommendedGzipSettings = true;
       recommendedProxySettings = true;
     };
-    networking.firewall =
-      let
-        ports = [
-          config.services.nginx.defaultHTTPListenPort
-          config.services.nginx.defaultSSLListenPort
-        ];
-      in
-      {
-        allowedTCPPorts = ports;
-        allowedUDPPorts = ports;
-      };
   };
 }