1 files changed, 2 insertions, 150 deletions

diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix
index 2d9a7b8f..85ddd4ef 100644
--- a/hosts/vidhar/network/default.nix
+++ b/hosts/vidhar/network/default.nix
@@ -1,6 +1,6 @@
-{ flake, config, lib, pkgs, ... }:
+{ ... }:
 {
-  imports = [ ./dsl.nix ./bifrost ];
+  imports = [ ./dsl.nix ./bifrost ./dhcp ];
 
   config = {
     networking = {
@@ -53,132 +53,6 @@
       llmnr = "false";
     };
 
-    services.kea = {
-      dhcp4 = {
-        enable = true;
-        settings = {
-          valid-lifetime = 4000;
-          rebind-timer = 2000;
-          renew-timer = 1000;
-
-          interfaces-config = {
-            interfaces = [ "lan" "mgmt" ];
-          };
-
-          lease-database = {
-            name = "/var/lib/kea/dhcp4.leases";
-            persist = true;
-            type = "memfile";
-          };
-
-          client-classes = [
-            { name = "ipxe";
-              test = "option[77].hex == 'iPXE'";
-              next-server = "10.141.0.1";
-              boot-file-name = "netboot.ipxe";
-              only-if-required = true;
-            }
-            { name = "uefi-64";
-              test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00007' or substring(option[60].hex,0,20) == 'PXEClient:Arch:00008' or substring(option[60].hex,0,20) == 'PXEClient:Arch:00009'";
-              only-if-required = true;
-              option-data = [
-                { name = "tftp-server-name"; data = "10.141.0.1"; }
-              ];
-              boot-file-name = "ipxe.efi";
-            }
-            { name = "uefi-32";
-              test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00002' or substring(option[60].hex,0,20) == 'PXEClient:Arch:00006'";
-              only-if-required = true;
-              option-data = [
-                { name = "tftp-server-name"; data = "10.141.0.1"; }
-              ];
-              boot-file-name = "i386-ipxe.efi";
-            }
-            { name = "legacy";
-              test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00000'";
-              only-if-required = true;
-              option-data = [
-                { name = "tftp-server-name"; data = "10.141.0.1"; }
-              ];
-              boot-file-name = "undionly.kpxe";
-            }
-          ];
-
-          subnet4 = [
-            { subnet = "10.141.0.0/24";
-              option-data = [
-                { name = "domain-name-servers";
-                  data = "10.141.0.1";
-                }
-                { name = "broadcast-address";
-                  data = "10.141.0.255";
-                }
-                { name = "routers";
-                  data = "10.141.0.1";
-                }
-                { name = "domain-name";
-                  data = "yggdrasil";
-                }
-              ];
-              pools = [ { pool = "10.141.0.128 - 10.141.0.254"; } ];
-              reservations = [];
-              require-client-classes = ["ipxe" "uefi-64" "uefi-32" "legacy"];
-            }
-            { subnet = "10.141.1.0/24";
-              option-data = [
-                { name = "domain-name-servers";
-                  data = "10.141.1.1";
-                }
-                { name = "broadcast-address";
-                  data = "10.141.1.255";
-                }
-              ];
-              pools = [ { pool = "10.141.1.128 - 10.141.1.254"; } ];
-              reservations = [
-                { hostname = "switch01";
-                  hw-address = "60:a4:b7:53:94:b5";
-                  ip-address = "10.141.1.2";
-                }
-                { hostname = "ap01";
-                  hw-address = "74:ac:b9:29:ad:9a";
-                  ip-address = "10.141.1.4";
-                }
-              ];
-            }
-            { subnet = "10.141.2.0/24";
-              option-data = [
-                { name = "domain-name-servers";
-                  data = "10.141.2.1";
-                }
-                { name = "broadcast-address";
-                  data = "10.141.2.255";
-                }
-                { name = "routers";
-                  data = "10.141.2.1";
-                }
-              ];
-              pools = [ { pool = "10.141.2.128 - 10.141.2.254"; } ];
-              reservations = [];
-            }
-          ]; 
-        };
-      };
-      dhcp6 = {
-        enable = true;
-        settings = {
-          interfaces-config = {
-            interfaces = [ "lan" ];
-          };
-
-          lease-database = {
-            name = "/var/lib/kea/dhcp6.leases";
-            persist = true;
-            type = "memfile";
-          };
-        };
-      };
-    };
-
     systemd.network.networks = {
       "eno1" = {
         matchConfig.Name = "eno1";
@@ -191,27 +65,5 @@
         networkConfig.LinkLocalAddressing = "no";
       };
     };
-
-    systemd.services."installer-atftpd" = {
-      description = "TFTP Server for PXE Booting NixOS Installer";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = let
-        installerBuild = flake.nixosConfigurations.installer-x86_64-linux-netboot.config.system.build;
-        ipxe = pkgs.ipxe.override {
-          additionalTargets = {
-            "bin-i386-efi/ipxe.efi" = "i386-ipxe.efi";
-          };
-        };
-        tftpRoot = pkgs.runCommandLocal "installer-netboot" {} ''
-          mkdir -p $out
-          install -m 0444 -t $out \
-            ${installerBuild.netbootRamdisk}/initrd \
-            ${installerBuild.kernel}/bzImage \
-            ${installerBuild.netbootIpxeScript}/netboot.ipxe \
-            ${ipxe}/ipxe.efi ${ipxe}/i386-ipxe.efi ${ipxe}/undionly.kpxe
-        '';
-      in "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address=10.141.0.1 ${tftpRoot}";
-    };
   };
 }