temp pi5

flake.nix

@@ -119,7 +119,7 @@
 
     # nixpgs
     Pi5-nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-24.11";
+      url = "github:NixOS/nixpkgs/nixos-24.05";
     };
 
     # Home Manager
@@ -144,7 +144,7 @@
       inputs.nixpkgs.follows = "Pi5-nixpkgs";
     };
 
-    raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
+    nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi";
 
     #####################################################
     #                  Steamdeck                        #
@@ -256,7 +256,7 @@
       Pi5-impermanence,
       Pi5-nixos-hardware,
       Pi5-sops-nix,
-      raspberry-pi-nix,
+      nixos-raspberrypi,
 
       # Steamdeck
       steamdeck-nixpkgs,
@@ -384,31 +384,77 @@
         };
 
         # Pi5
-        "pi5" = Pi5-nixpkgs.lib.nixosSystem {
-          system = "aarch64-linux";
+        "pi5" = nixos-raspberrypi.lib.nixosSystem {
+          specialArgs = inputs;
           modules = [
-            Pi5-nixos-hardware.nixosModules.raspberry-pi-4
-            Pi5-impermanence.nixosModules.impermanence
-            ./hosts/pi5/configuration.nix
-            Pi5-sops-nix.nixosModules.sops
-            raspberry-pi-nix.nixosModules.raspberry-pi
-            raspberry-pi-nix.nixosModules.sd-image
-
-            Pi5-home-manager.nixosModules.home-manager
             {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.matt = 
-                { ... }:
-                {
-                  imports = [
-                    ./hosts/pi5/home.nix
-                    Pi5-sops-nix.homeManagerModules.sops
-                  ];
-                };
+              # Hardware specific configuration, see section below for a more complete 
+              # list of modules
+              imports = with nixos-raspberrypi.nixosModules; [
+                raspberry-pi-5.base
+                raspberry-pi-5.display-vc4
+                raspberry-pi-5.bluetooth
+              ];
             }
+
+            ({ config, pkgs, lib, ... }:
+            let
+              kernelBundle = pkgs.linuxAndFirmware.v6_6_31;
+            in {
+              boot = {
+                loader.raspberryPi.firmwarePackage = kernelBundle.raspberrypifw;
+                kernelPackages = kernelBundle.linuxPackages_rpi5;
+              };
+              nixpkgs.overlays = lib.mkAfter [
+                (self: super: {
+                  # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least 
+                  # enableRedistributableFirmware is enabled
+                  # I know no easier way to override this package
+                  inherit (kernelBundle) raspberrypiWirelessFirmware;
+                  # Some derivations want to use it as an input,
+                  # e.g. raspberrypi-dtbs, omxplayer, sd-image-* modules
+                  inherit (kernelBundle) raspberrypifw;
+                })
+              ];
+              networking.hostName = "pi5";
+
+              system.nixos.tags = let
+                cfg = config.boot.loader.raspberryPi;
+              in [
+                "raspberry-pi-${cfg.variant}"
+                cfg.bootloader
+                config.boot.kernelPackages.kernel.version
+              ];
+            })
+
+            # ...
+
           ];
         };
+        # "pi5" = Pi5-nixpkgs.lib.nixosSystem {
+        #   system = "aarch64-linux";
+        #   modules = [
+        #     Pi5-nixos-hardware.nixosModules.raspberry-pi-4
+        #     Pi5-impermanence.nixosModules.impermanence
+        #     ./hosts/pi5/configuration.nix
+        #     Pi5-sops-nix.nixosModules.sops
+            
+
+        #     Pi5-home-manager.nixosModules.home-manager
+        #     {
+        #       home-manager.useGlobalPkgs = true;
+        #       home-manager.useUserPackages = true;
+        #       home-manager.users.matt = 
+        #         { ... }:
+        #         {
+        #           imports = [
+        #             ./hosts/pi5/home.nix
+        #             Pi5-sops-nix.homeManagerModules.sops
+        #           ];
+        #         };
+        #     }
+        #   ];
+        # };
 
         "steamdeck" = steamdeck-nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";