check

systems/aarch64-linux/pi4/boot.nix

@@ -4,16 +4,13 @@
   namespace,
   ...
 }:
-let
-  # kernelBundle = pkgs.linuxAndFirmware.latest;
-in
 {
   boot = {
-  #   loader.raspberry-pi = {
-  #     firmwarePackage = kernelBundle.raspberrypifw;
-  #     variant = "4";
-  #   };
-  #   kernelPackages = kernelBundle.linuxPackages_rpi4;
+    #   loader.raspberry-pi = {
+    #     firmwarePackage = kernelBundle.raspberrypifw;
+    #     variant = "4";
+    #   };
+    #   kernelPackages = kernelBundle.linuxPackages_rpi4;
     # kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto;
     kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = lib.mkForce [ ];

systems/aarch64-linux/pi5/boot.nix

@@ -1,38 +1,43 @@
-{ pkgs, lib, namespace, ... }:
-let
-  # kernelBundle = pkgs.linuxAndFirmware.latest;
-in
+{
+  pkgs,
+  lib,
+  namespace,
+  ...
+}:
 {
   boot = {
     # loader.raspberry-pi = {
     #   bootloader = "kernel";
     #   firmwarePackage = pkgs.raspberrypifw;
     # };
-    kernelPackages = pkgs.${namespace}.linuxPackages_rpi5;
+    kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = lib.mkForce [ ];
   };
 
   ${namespace}.hardware.raspberry-pi.config = {
+    # extra-config = {
+    #   armstub = "RPI_EFI.fd";
+    # };
     all = {
-      # [all] conditional filter, https://www.raspberrypi.com/documentation/computers/config_txt.html#conditional-filters
+      #   # [all] conditional filter, https://www.raspberrypi.com/documentation/computers/config_txt.html#conditional-filters
 
-      options = {
-        # https://www.raspberrypi.com/documentation/computers/config_txt.html#enable_uart
-        # in conjunction with `console=serial0,115200` in kernel command line (`cmdline.txt`)
-        # creates a serial console, accessible using GPIOs 14 and 15 (pins
-        #  8 and 10 on the 40-pin header)
-        enable_uart = {
-          enable = true;
-          value = true;
-        };
-        # https://www.raspberrypi.com/documentation/computers/config_txt.html#uart_2ndstage
-        # enable debug logging to the UART, also automatically enables
-        # UART logging in `start.elf`
-        uart_2ndstage = {
-          enable = true;
-          value = true;
-        };
-      };
+      # options = {
+      #     # https://www.raspberrypi.com/documentation/computers/config_txt.html#enable_uart
+      #     # in conjunction with `console=serial0,115200` in kernel command line (`cmdline.txt`)
+      #     # creates a serial console, accessible using GPIOs 14 and 15 (pins
+      #     #  8 and 10 on the 40-pin header)
+      #     enable_uart = {
+      #       enable = true;
+      #       value = true;
+      #     };
+      #     # https://www.raspberrypi.com/documentation/computers/config_txt.html#uart_2ndstage
+      #     # enable debug logging to the UART, also automatically enables
+      #     # UART logging in `start.elf`
+      #     uart_2ndstage = {
+      #       enable = true;
+      #       value = true;
+      #     };
+      #   };
 
       # Base DTB parameters
       # https://github.com/raspberrypi/linux/blob/a1d3defcca200077e1e382fe049ca613d16efd2b/arch/arm/boot/dts/overlays/README#L132
@@ -52,6 +57,24 @@ in
 
       };
 
+      # extra-config = ''
+      #   armstub=RPI_EFI.fd
+      #   device_tree_address=0x1f0000
+      #   device_tree_end=0x210000
+
+      #   # Force 32 bpp framebuffer allocation.
+      #   framebuffer_depth=32
+
+      #   # Disable compensation for displays with overscan.
+      #   disable_overscan=1
+
+      #   # Force maximum USB power regardless of the power supply.
+      #   usb_max_current_enable=1
+
+      #   # Force maximum CPU speed.
+      #   force_turbo=1
+      # '';
+
     };
   };
 }

systems/aarch64-linux/pi5/default.nix

@@ -3,7 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  pkgs,
   namespace,
   ...
 }:
@@ -45,16 +44,20 @@
     hardware = {
       disko = {
         enable = true;
-        enableFirmware = true;
+        firmware = {
+          enableFirmware = false;
+          firmwareDisk = "/dev/mmcblk0";
+        };
       };
       raspberry-pi = {
         enable = true;
         variant = "5";
-        pwm.enable = true;
-        disable-wifi.enable = true;
-        modesetting.enable = true; 
-        i2c.enable = true;
-        apply-overlays-dtmerge.enable = true;
+        bootType = "kernel";
+        pwm.enable = false;
+        disable-wifi.enable = false;
+        modesetting.enable = false;
+        i2c.enable = false;
+        apply-overlays-dtmerge.enable = false;
       };
     };
 

systems/x86_64-linux/matt-nixos/boot.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, namespace, ... }:
+{
+  config,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   kernel = pkgs.${namespace}.linuxPackages_cachyos-lto-znver4;
   pkgsVersion = pkgs; # .unstable;

systems/x86_64-linux/matt-nixos/default.nix

@@ -77,20 +77,20 @@
   #   capabilities = "cap_net_admin+p";
   # };
 
-#  specialisation = {
- #   "cosmic" = {
-#      enable = false;
-#      configuration = {
-#        ${namespace} = {
-#          desktop = {
-#            cosmic.enable = lib.mkForce true;
-#            hyprland = {
-#              enable = lib.mkForce false;
-#            };
- #           gnome.enable = lib.mkForce false;
- #         };
-#        };
-#      };
-#    };
-#  };
+  #  specialisation = {
+  #   "cosmic" = {
+  #      enable = false;
+  #      configuration = {
+  #        ${namespace} = {
+  #          desktop = {
+  #            cosmic.enable = lib.mkForce true;
+  #            hyprland = {
+  #              enable = lib.mkForce false;
+  #            };
+  #           gnome.enable = lib.mkForce false;
+  #         };
+  #        };
+  #      };
+  #    };
+  #  };
 }