make genepi boot again

This commit is contained in:
2025-06-05 20:42:15 +02:00
parent 03c97d8431
commit 628b996be4
4 changed files with 42 additions and 16 deletions

View File

@@ -115,6 +115,30 @@
]; ];
} }
); );
packages.aarch64-linux.genepi-installer-sd-image = nixos-generators.nixosGenerate {
specialArgs = {
inherit inputs;
inherit (import ./parts) keys;
};
system = "aarch64-linux";
format = "sd-aarch64-installer";
modules = [
nixos-hardware.nixosModules.raspberry-pi-4
./system/core
./machines/genepi/network.nix
./machines/genepi/hardware-configuration.nix
{ networking.hostName = "genepi"; }
{ sdImage.compressImage = false; }
{
nixpkgs.overlays = [
(final: super: {
makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
})
];
}
];
};
}; };
inputs = { inputs = {

View File

@@ -8,12 +8,18 @@
]; ];
boot.loader = { boot.loader = {
grub.enable = false; generic-extlinux-compatible.enable = false;
generic-extlinux-compatible.enable = true; efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
}; };
nixpkgs.overlays = [
(final: super: {
makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
})
];
boot.supportedFilesystems = [ boot.supportedFilesystems = [
"btrfs"
"vfat" "vfat"
]; ];
} }

View File

@@ -15,14 +15,10 @@ in
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
boot = {
type = "EF02";
size = "1M";
priority = 1;
};
ESP = { ESP = {
type = "EF00"; type = "EF00";
size = "512M"; size = "512M";
priority = 1;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";

View File

@@ -1,20 +1,20 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [
# inputs.nixos-hardware.nixosModules.raspberry-pi-4 inputs.nixos-hardware.nixosModules.raspberry-pi-4
]; ];
nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.hostPlatform = "aarch64-linux";
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
# hardware = { hardware = {
# raspberry-pi."4".apply-overlays-dtmerge.enable = true; raspberry-pi."4".apply-overlays-dtmerge.enable = true;
# deviceTree = { deviceTree = {
# enable = true; enable = true;
# filter = "*rpi-4-*.dtb"; filter = "*rpi-4-*.dtb";
# }; };
# }; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
libraspberrypi libraspberrypi