Skip to content

fix: unbreak gaia and spdr builds after the flake.lock update #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devusb wants to merge 4 commits into from
Open

fix: unbreak gaia and spdr builds after the flake.lock update #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2efe8e9
chore(overlays): drop karakeep node pin
devusb Aug 30, 2026
5efe220
fix(gaia): replace removed poe-plus-hat option
devusb Aug 30, 2026
a2d7adc
fix(spdr): drop t2 patches that conflict with 6.18.47
devusb Aug 30, 2026
a423519
chore(gaia1): drop inert dwc2 and audio options
devusb Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions hosts/gaia/fan-control.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{ pkgs, ... }:
{
hardware.raspberry-pi."4" = {
poe-plus-hat.enable = true;
};
hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = true;

hardware.deviceTree = {
filter = "bcm2711-rpi-4*.dtb";
overlays = pkgs.lib.mkForce [
{
name = "rpi-poe-plus-overlay";
Expand Down
2 changes: 0 additions & 2 deletions hosts/gaia/gaia1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ in
};

hardware.raspberry-pi."4" = {
dwc2.enable = true;
fkms-3d.enable = true;
audio.enable = true;
};

networking.hostName = "gaia1";
Expand Down
24 changes: 24 additions & 0 deletions hosts/spdr/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,30 @@ in
};
boot.loader.timeout = 10;

# kernel
boot.kernelPackages =
let
linuxT2 = "${inputs.nixos-hardware}/apple/t2/pkgs/linux-t2";
patchset = builtins.fromJSON (builtins.readFile "${linuxT2}/stable.json");
dropped = [
"4001-asahi-trackpad.patch"
"4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch"
"4005-HID-magicmouse-fix-regression-breaking-support-for-M.patch"
];
in
lib.mkForce (
pkgs.linuxPackagesFor (
pkgs.callPackage "${linuxT2}/generic.nix" { } {
kernel = pkgs.linux_6_18;
patchesFile = builtins.toFile "stable.json" (
builtins.toJSON (
patchset // { patches = lib.filter (p: !(builtins.elem p.name dropped)) patchset.patches; }
)
);
}
)
);

# zfs
boot.supportedFilesystems = [ "zfs" ];
boot.kernelParams = [ "zfs.zfs_arc_max=2147483648" ];
Expand Down
5 changes: 0 additions & 5 deletions overlay/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ final: prev: {
});
};

# needed until https://github.com/NixOS/nixpkgs/pull/554776 lands
karakeep = prev.karakeep.override {
nodejs = prev.nodejs_22;
};

python314Packages = prev.python314Packages.overrideScope (
final: prev: {
python-ldap = prev.python-ldap.overridePythonAttrs { doCheck = false; };
Expand Down