This commit is contained in:
@@ -5,6 +5,7 @@ let
|
||||
|
||||
cfg = config.my.netboot;
|
||||
|
||||
# Newer releases don't boot on desktop?
|
||||
ipxe = pkgs.ipxe.overrideAttrs (o: rec {
|
||||
version = "1.21.1-unstable-2024-06-27";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@@ -17,7 +18,7 @@ let
|
||||
tftpRoot = pkgs.linkFarm "tftp-root" [
|
||||
{
|
||||
name = "ipxe-x86_64.efi";
|
||||
path = "${ipxe}/ipxe.efi";
|
||||
path = "${pkgs.ipxe}/ipxe.efi";
|
||||
}
|
||||
];
|
||||
menuFile = pkgs.runCommand "menu.ipxe" {
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{ lib, pkgs, config, ... }:
|
||||
let
|
||||
inherit (lib) flatten optional mkIf mkDefault mkMerge;
|
||||
inherit (lib) flatten optional mkIf mkDefault mkMerge versionAtLeast;
|
||||
in
|
||||
{
|
||||
config = mkMerge [
|
||||
@@ -13,9 +13,11 @@ in
|
||||
};
|
||||
|
||||
systemd = {
|
||||
additionalUpstreamSystemUnits = [
|
||||
additionalUpstreamSystemUnits = mkIf (config.system.nixos.release == "24.12:u-24.11") [
|
||||
# TODO: NixOS has its own version of this, but with `network` instead of `networkd`. Is this just a typo? It
|
||||
# hasn't been updated in 2 years...
|
||||
# This has been done upstream now :)
|
||||
# TODO: Remove when 25.05 releases
|
||||
"systemd-networkd-wait-online@.service"
|
||||
];
|
||||
};
|
||||
|
@@ -551,7 +551,7 @@ in
|
||||
];
|
||||
});
|
||||
})
|
||||
(mkIf config.services.pds.enable {
|
||||
(mkIf (config.services ? "pds" && config.services.pds.enable) {
|
||||
my.tmproot.persistence.config.directories = [
|
||||
{
|
||||
directory = "/var/lib/pds";
|
||||
|
Reference in New Issue
Block a user