many changes and more modularizing

hosts/fw/modules/web/default.nix

@@ -49,6 +49,7 @@ in {
 
         imports = [
           "${impermanence}/nixos.nix"
+          ../network-prefix.nix
           ../../utils/modules/sops.nix
           ../../utils/modules/lego/lego.nix
           # ../../utils/modules/borgbackup.nix
@@ -58,13 +59,15 @@ in {
           ./matrix.nix
         ];
 
+        networkPrefix = config.networkPrefix;
+
         time.timeZone = "Europe/Vienna";
 
         systemd.network.networks."10-lan" = {
           matchConfig.PermanentMACAddress = "02:00:00:00:01:01";
-          address = [ "10.42.97.5/24" ];
-          gateway = [ "10.42.97.1" ];
-          dns = [ "10.42.97.1" ];
+          address = [ "${config.networkPrefix}.97.5/24" ];
+          gateway = [ "${config.networkPrefix}.97.1" ];
+          dns = [ "${config.networkPrefix}.97.1" ];
         };
 
         fileSystems."/persist".neededForBoot = lib.mkForce true;

hosts/fw/modules/web/proxies.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{ config, lib, ... }: {
   services.nginx.virtualHosts."git.cloonar.com" = {
     forceSSL = true;
     enableACME = true;
@@ -12,7 +12,7 @@
     enableACME = true;
     acmeRoot = null;
     locations."/" = {
-      proxyPass = "http://10.42.97.21:30000";
+      proxyPass = "http://${config.networkPrefix}.97.21:30000";
       proxyWebsockets = true;
     };
   };