many changes and more modularizing

hosts/fw/modules/gitea.nix

@@ -2,6 +2,7 @@
 let
   cids = import ../modules/staticids.nix;
   domain = "git.cloonar.com";
+  networkPrefix = config.networkPrefix;
   
   user = {
     isSystemUser = true;
@@ -27,8 +28,8 @@ in
     ephemeral = false; # because of ssh key
     privateNetwork = true;
     hostBridge = "server";
-    hostAddress = "10.42.97.1";
-    localAddress = "10.42.97.50/24";
+    hostAddress = "${networkPrefix}.97.1";
+    localAddress = "${networkPrefix}.97.50/24";
     bindMounts = {
       "/var/lib/gitea" = {
         hostPath = "/var/lib/gitea/";
@@ -55,11 +56,11 @@ in
         hostName = "git";
         useHostResolvConf = false;
         defaultGateway = {
-          address = "10.42.96.1";
+          address = "${networkPrefix}.96.1";
           interface = "eth0";
         };
         firewall.enable = false;
-        nameservers = [ "10.42.97.1" ];
+        nameservers = [ "${networkPrefix}.97.1" ];
       };
 
       services.nginx.enable = true;