meow

config/hosts/aspects/servers/rpi5.nix

@@ -7,6 +7,7 @@
   den.aspects.rpi5 = {
     includes = [
       <modules/raspberry-pi/5>
+      modules.rpi-cache
       # <modules/services/traefik>
       <modules/services/caddy>
       <modules/services/home-assistant>

config/modules/raspberry-pi.nix

@@ -7,32 +7,58 @@
 }: {
   flake-file.inputs = {
     raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
+    nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
   modules.raspberry-pi = {
     provides = {
       "5" = {
-        nixos = {
-          pkgs,
-          modulesPath,
-          ...
-        }: {
+        nixos = {pkgs, ...}: {
           imports = [
-            inputs.nixos-hardware.nixosModules.raspberry-pi-5
-            "${modulesPath}/installer/sd-card/sd-image-aarch64.nix"
+            # inputs.nixos-hardware.nixosModules.raspberry-pi-5
+            inputs.nixos-raspberrypi.lib.inject-overlays-global
+            inputs.nixos-raspberrypi.nixosModules.trusted-nix-caches
+            inputs.nixos-raspberrypi.lib.inject-overlays
+
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.base
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.page-size-16k
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4
+            inputs.nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth
+
+            inputs.nixos-raspberrypi.nixosModules.sd-image
           ];
 
           environment.systemPackages = with pkgs; [
             libraspberrypi
           ];
 
+          _module.args = {inherit (inputs) nixos-raspberrypi;};
+
           sdImage.compressImage = false;
 
-          boot.initrd.systemd.tpm2.enable = false;
-          boot.initrd.allowMissingModules = true;
-          boot.zfs.forceImportRoot = false;
+          boot.loader.raspberry-pi.bootloader = "kernel";
+          # boot.initrd.systemd.tpm2.enable = false;
+          # boot.initrd.allowMissingModules = true;
+          boot.supportedFilesystems.zfs = false;
 
           # hardware.enableRedistributableFirmware = true;
+          # fileSystems = {
+          #   "/boot/firmware" = {
+          #     device = "/dev/disk/by-uuid/2175-794E";
+          #     fsType = "vfat";
+          #     options = [
+          #       "noatime"
+          #       "noauto"
+          #       "x-systemd.automount"
+          #       "x-systemd.idle-timeout=1min"
+          #     ];
+          #   };
+          #   "/" = {
+          #     device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
+          #     fsType = "ext4";
+          #     options = ["noatime"];
+          #   };
+          # };
         };
       };
     };

config/modules/rpi-cache.nix

@@ -0,0 +1,10 @@
+{ inputs, ... }: {
+  modules.rpi-cache = {
+    nixos = {
+      nix.settings = {
+        substituters = inputs.nixos-raspberrypi.nixConfig."extra-substituters";
+        trusted-public-keys = inputs.nixos-raspberrypi.nixConfig."extra-trusted-public-keys";
+      };
+    };
+  };
+}