diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 17 | ||||
| -rw-r--r-- | hosts/arrakis/default.nix | 3 | ||||
| -rw-r--r-- | hosts/common/core/default.nix | 2 | ||||
| -rw-r--r-- | hosts/common/optional/services/dhcp.nix | 36 | ||||
| -rw-r--r-- | overlays/default.nix | 13 |
5 files changed, 43 insertions, 28 deletions
@@ -27,7 +27,7 @@ # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages #nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; nixpkgs-master.url = "github:nixos/nixpkgs"; - #nixpkgs-pr367392.url = "github:sikmir/nixpkgs/dict"; + nixpkgs-pr369712.url = "github:7c6f434c/nixpkgs/fix-tftp-hpa"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -43,7 +43,20 @@ }; - outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-master, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let + outputs = { + disko, + home-manager-stable, + home-manager, + nixos-hardware, + nixpkgs-master, + nixpkgs-pr369712, + nixpkgs-stable, + nixpkgs, + nvidia-patch, + self, + sops-nix, + ... + } @ inputs: let inherit (self) outputs; systems = [ #"aarch64-linux" 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" ]; + }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index e6b5988..ff0e836 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,6 +6,7 @@ # outputs.overlays.modifications # outputs.overlays."67e692392-packages" # outputs.overlays.master-packages +# outputs.overlays.pr369712-packages # outputs.overlays.stable-packages # ] @@ -38,12 +39,12 @@ }; }; - #pr363651-packages = final: _prev: { - # pr363651 = import inputs.nixpkgs-pr363651 { - # inherit (final) system; - # config.allowUnfree = true; - # }; - #}; + pr369712-packages = final: _prev: { + pr369712 = import inputs.nixpkgs-pr369712 { + inherit (final) system; + config.allowUnfree = true; + }; + }; # When applied, the stable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.stable' |