more raspberry bootloader option massaging

This commit is contained in:
oxapentane - 2022-08-22 20:09:30 +02:00
parent 4f0f311a6d
commit 129ea044f2
Signed by: oxapentane
GPG Key ID: 91FA5E5BF9AA901C
5 changed files with 23 additions and 25 deletions

View File

@ -180,7 +180,7 @@
staging-data-hoarder."x86_64-linux" = self.nixosConfigurations.staging-data-hoarder.config.system.build.toplevel;
traffic-stop-box-0."x86_64-linux" = self.nixosConfigurations.traffic-stop-box-0.config.system.build.toplevel;
traffic-stop-box-0-disk."x86_64-linux" = self.nixosConfigurations.traffic-stop-box-0.config.system.build.diskImage;
traffic-stop-box-3."x86_64-linux" = self.nixosConfigurations.traffic-stop-box-3.config.system.build.toplevel;
traffic-stop-box-3."aarch64-linux" = self.nixosConfigurations.traffic-stop-box-3.config.system.build.toplevel;
traffic-stop-box-3-disk."x86_64-linux" = self.nixosConfigurations.traffic-stop-box-3.config.system.build.sdImage;
mobile-box."x86_64-linux" = self.nixosConfigurations.mobile-box.config.system.build.toplevel;
mobile-box-disk."x86_64-linux" = self.nixosConfigurations.mobile-box.config.system.build.diskImage;

View File

@ -1,4 +1,4 @@
{ ... }:
{ config, lib, ... }:
{
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
@ -7,10 +7,26 @@
networking.useDHCP = false;
networking.interfaces.enp1s0.useDHCP = true;
boot.tmpOnTmpfsSize = "25%";
boot.kernelModules = [ "kvm-intel" ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.configurationLimit = 1;
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "sdhci_acpi" ];
boot.initrd.kernelModules = [ ];
boot.extraModulePackages = [ ];
swapDevices = [ ];
fileSystems."/" =
{
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
}

View File

@ -1,15 +1,12 @@
{ lib, pkgs, ... }:
{
imports = [
];
boot = {
loader = {
grub.enable = false;
raspberryPi = {
enable = true;
version = 4;
};
# raspberryPi = {
# enable = true;
# version = 4;
# };
};
kernelPackages = pkgs.linuxPackages_latest;
# No ZFS on latest kernel:
@ -24,4 +21,5 @@
networking.useDHCP = false;
networking.interfaces.eth0.useDHCP = true;
# boot.loader.generic-extlinux-compatible.enable = lib.mkForce false;
}

View File

@ -23,10 +23,6 @@
SystemMaxUse=5M
'';
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.configurationLimit = 1;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave

View File

@ -9,16 +9,4 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "sdhci_acpi" ];
boot.initrd.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/boot" =
{
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
swapDevices = [ ];
}