From 161e1e00426741ed72daf4ce3a4bd1a7bab4bc82 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Tue, 31 Dec 2024 11:15:38 -0800
Subject: Add tfp-hpa from PR 369712

---
 hosts/arrakis/default.nix               |  3 ++-
 hosts/common/core/default.nix           |  2 +-
 hosts/common/optional/services/dhcp.nix | 36 ++++++++++++++++-----------------
 3 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'hosts')

diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index d42929b..a45f2b3 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -106,7 +106,7 @@
     warzone2100
     wpa_supplicant
     xonotic-sdl
-    #xpilot-ng
+    master.xpilot-ng
   ];
 
   imports = [
@@ -229,6 +229,7 @@
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.master-packages
+      outputs.overlays.pr369712-packages
       outputs.overlays.stable-packages
     ];
   };
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index a6bb4e8..e6439a6 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -82,7 +82,7 @@
     strace
     sysstat
     tcpdump
-    #tftp-hpa
+    pr369712.tftp-hpa
     traceroute
     tree
     tshark
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index cdd17be..700d4ce 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -3,13 +3,13 @@
 
   environment = {
     etc = {
-      #"tftp/ipxe.efi".source = "${pkgs.ipxe}/ipxe.efi";
-      #"tftp/undionly.kpxe".source = "${pkgs.ipxe}/undionly.kpxe";
+      "tftp/ipxe.efi".source = "${pkgs.ipxe}/ipxe.efi";
+      "tftp/undionly.kpxe".source = "${pkgs.ipxe}/undionly.kpxe";
     };
 
     systemPackages = with pkgs; [
       ipxe
-      #tftp-hpa
+      pr369712.tftp-hpa
       master.wol
     ];
   };
@@ -114,20 +114,20 @@
   };
 
   systemd.services = {
-    #tftpd = {
-    #  after = [ "nftables.service" ];
-    #  description = "TFTP server";
-    #  serviceConfig = {
-    #    User = "root";
-    #    Group = "root";
-    #    Restart = "always";
-    #    RestartSec = 5;
-    #    Type = "exec";
-    #    ExecStart = "${pkgs.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
-    #    TimeoutStopSec = 20;
-    #    PIDFile = "/run/tftpd.pid";
-    #  };
-    #  wantedBy = [ "multi-user.target" ];
-    #};
+    tftpd = {
+      after = [ "nftables.service" ];
+      description = "TFTP server";
+      serviceConfig = {
+        User = "root";
+        Group = "root";
+        Restart = "always";
+        RestartSec = 5;
+        Type = "exec";
+        ExecStart = "${pkgs.pr369712.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
+        TimeoutStopSec = 20;
+        PIDFile = "/run/tftpd.pid";
+      };
+      wantedBy = [ "multi-user.target" ];
+    };
   };
 }
-- 
cgit v1.2.3