From c6cfaaa1295ecd166335573edcb608dbbd20558a Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 16 Mar 2022 02:20:22 +0100
Subject: [PATCH] nix-build: move to serv subnet

---
 flake.lock                             | 8 ++++----
 host-registry.nix                      | 2 --
 hosts/containers/nix-build/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 35846b51..8aea434a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -466,11 +466,11 @@
         "openwrt": "openwrt"
       },
       "locked": {
-        "lastModified": 1646754939,
-        "narHash": "sha256-pfXU+dNK5oaE2736e3xOJfLGC4S804ttO/sKvsFrf2k=",
+        "lastModified": 1647392285,
+        "narHash": "sha256-Kil7rfCMLBoDjpol2ySwVwKhm3nbQVTkGRKEECp9mBs=",
         "ref": "master",
-        "rev": "3b474ba9b15b712d833e10f01d67fc7fbccb8f49",
-        "revCount": 1368,
+        "rev": "8d64902f6a821da367c9dd684f04d86ff374e335",
+        "revCount": 1372,
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git"
       },
diff --git a/host-registry.nix b/host-registry.nix
index 9496e492..1b960bf1 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -53,8 +53,6 @@
 
   nfs = { };
 
-  nix-build.ip4 = "172.22.99.156";
-
   nncp = {
     ip6 = "2a00:8180:2c00:223:dcec:9aff:fe6f:3f63";
     publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQhxaeElmxO1UgaI/+qr+g13OFeY9qtJVxznNN+xs/e";
diff --git a/hosts/containers/nix-build/default.nix b/hosts/containers/nix-build/default.nix
index e35515af..744e9d24 100644
--- a/hosts/containers/nix-build/default.nix
+++ b/hosts/containers/nix-build/default.nix
@@ -6,11 +6,11 @@
   networking.interfaces.enp6s18 = {
     ipv4.addresses = [{
       address = config.c3d2.hosts.nix-build.ip4;
-      prefixLength = zentralwerk.lib.config.site.net.c3d2.subnet4Len;
+      prefixLength = zentralwerk.lib.config.site.net.serv.subnet4Len;
     }];
     useDHCP = false;
   };
-  networking.defaultGateway = "172.22.99.1";
+  networking.defaultGateway = "172.20.73.1";
   networking.firewall.allowedTCPPorts = [ 22 ];
   networking.nameservers = [ "172.20.73.8" "9.9.9.9" ];