From d8a261d68f1f7c6a888ae38cdc8ca66a80e39a4d Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Mon, 25 Mar 2024 20:57:27 +0100
Subject: [PATCH] fix: DHCP config in management LAN

---
 nixos/agares/dns.nix     |  2 ++
 nixos/agares/network.nix | 34 ++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/nixos/agares/dns.nix b/nixos/agares/dns.nix
index bba7c55..7e52d8b 100644
--- a/nixos/agares/dns.nix
+++ b/nixos/agares/dns.nix
@@ -40,6 +40,8 @@
         val-permissive-mode = true;
         local-data = [
           "\"agares.bs.dadada.li. 10800 IN A 192.168.101.1\""
+          "\"danjal.bs.dadada.li. 10800 IN A 192.168.100.108\""
+          "\"legion.bs.dadada.li. 10800 IN A 192.168.100.107\""
           "\"ninurta.bs.dadada.li. 10800 IN A 192.168.101.184\""
           "\"agares.bs.dadada.li. 10800 IN AAAA fd42:9c3b:f96d:101::1\""
           "\"ninurta.bs.dadada.li. 10800 IN AAAA fd42:9c3b:f96d:101:4a21:bff:fe3e:9cfe\""
diff --git a/nixos/agares/network.nix b/nixos/agares/network.nix
index 6ed3f1c..61af8ea 100644
--- a/nixos/agares/network.nix
+++ b/nixos/agares/network.nix
@@ -134,18 +134,28 @@ in
         };
       in
       {
-        "10-mgmt" = subnet "enp1s0" "100" // {
-          networkConfig.VLAN = [ "lan.10" "ff.11" ];
-          dhcpServerStaticLeases = [
-            {
-              # legion
-              dhcpServerStaticLeaseConfig = {
-                Address = "192.168.100.107";
-                MACAddress = "80:CC:9C:95:4A:60";
-              };
-            }
-          ];
-        };
+        "10-mgmt" = lib.mkMerge [
+          (subnet "enp1s0" "100")
+          {
+            networkConfig.VLAN = [ "lan.10" "ff.11" ];
+            dhcpServerStaticLeases = [
+              {
+                # legion
+                dhcpServerStaticLeaseConfig = {
+                  Address = "192.168.100.107";
+                  MACAddress = "80:CC:9C:95:4A:60";
+                };
+              }
+              {
+                # danyal
+                dhcpServerStaticLeaseConfig = {
+                  Address = "192.168.100.108";
+                  MACAddress = "c8:9e:43:a3:3d:7f";
+                };
+              }
+            ];
+          }
+        ];
         "30-wg0" = {
           matchConfig.Name = "wg0";
           address = [ "10.3.3.2/32" "fd42:9c3b:f96d:121::2/128" ];