upd and cache

modules/nixos/hardware/raspberry-pi/default.nix

@@ -22,6 +22,11 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+
+    boot.initrd.availableKernelModules = lib.mkIf (cfg.variant == "5") [
+      "nvme"
+    ];
+
     # Common Raspberry Pi packages
     environment.systemPackages = with pkgs; [
       i2c-tools
@@ -36,20 +41,26 @@ in
     ];
 
     # Common Bluetooth configuration
-    systemd.services.btattach = {
-      before = [ "bluetooth.service" ];
-      after = [ "dev-ttyAMA0.device" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${lib.getExe' pkgs.bluez "btattach"} -B /dev/ttyAMA0 -P bcm -S 3000000";
+    systemd = {
+      services.btattach = {
+        before = [ "bluetooth.service" ];
+        after = [ "dev-ttyAMA0.device" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${lib.getExe' pkgs.bluez "btattach"} -B /dev/ttyAMA0 -P bcm -S 3000000";
+        };
       };
+
+      tmpfiles.packages = [
+        pkgs.${namespace}.udev-rules
+      ];
     };
 
     # Common hardware settings
-    hardware.i2c.enable = lib.mkDefault true;
-
-    # Pi specific settings
-    hardware.graphics.enable32Bit = lib.mkForce false;
+    hardware = {
+      i2c.enable = lib.mkDefault true;
+      graphics.enable32Bit = lib.mkForce false;
+    };
 
     # Pi specific system tags
     system.nixos.tags = (
@@ -67,6 +78,92 @@ in
     programs.kdeconnect.enable = lib.mkDefault false;
 
     # Root user shell configuration
-    users.users.root.shell = pkgs.zsh;
+    users = {
+      users.root.shell = pkgs.zsh;
+      extraGroups = {
+        gpio = {};
+        i2c = {};
+        input = {};
+        plugdev = {};
+        spi = {};
+        video = {};
+      };
+    };
+
+    services = {
+      udev.packages = [
+        pkgs.${namespace}.udev-rules
+      ];
+      xserver.extraConfig = let
+        identifier = "rp1";
+        driver = "rp1-vec|rp1-dsi|rp1-dpi";
+      in  ''
+        Section "OutputClass"
+          Identifier "${identifier}"
+          MatchDriver "${driver}"
+          Driver "modesetting"
+          Option "PrimaryGPU" "true"
+        EndSection
+      '';
+    };
+
+    nixpkgs.overlays = [
+      # (_self: super: {
+      #   ffmpeg = super.${namespace}.ffmpeg-rpi;
+      # })
+      # (_self: super: {
+      #   libraspberrypi = super.${namespace}.libraspberrypi;
+      # })
+      # (_self: super: {
+      #   raspberrypi-utils = super.${namespace}.raspberrypi-utils;
+      # })
+    ] ++ (if cfg.variant == "5" then [
+      (final: prev: {
+        ubootRaspberryPi5 = prev.uboot.ubootRaspberryPi4_64Bit.override {
+          defconfig = "rpi_5_defconfig";
+        };
+      })
+      # (final: prev:
+      #   let
+      #     mkPi5 = drv:
+      #       prev.lib.overrideDerivation
+      #         (drv // {
+      #           # Make sure we build the BCM2712 defconfig regardless of internal mapping
+      #           argsOverride = (drv.argsOverride or {}) // {
+      #             defconfig = "bcm2712_defconfig";
+      #           };
+      #           # Limit platforms to aarch64 for Pi 5
+      #           extraMeta = (drv.extraMeta or {}) // {
+      #             platforms = with prev.lib.platforms; prev.lib.intersectLists aarch64 linux;
+      #             hydraPlatforms = [ "aarch64-linux" ];
+      #           };
+      #         })
+      #         (old: {
+      #           postFixup = (old.postFixup or "") + ''
+      #             dtbDir=${if old.stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
+      #             copyDTB() { cp -v "$dtbDir/$1" "$dtbDir/$2"; }
+      #             # Pi 5 alias (only if your boot chain expects bcm283x-style names)
+      #             if [ -e "$dtbDir/bcm2712-rpi-5-b.dtb" ]; then
+      #               copyDTB bcm2712-rpi-5-b.dtb bcm2839-rpi-5-b.dtb
+      #             fi
+      #           '';
+      #         });
+      #   in {
+      #     # Assuming your package is exposed as pkgs.linux-rpi; adapt the name if different
+      #     linux-rpi5 = mkPi5 (prev.linux_rpi4.override { rpiVersion = 5; });
+      #   })
+      (final: prev: {
+        # https://github.com/nvmd/nixos-raspberrypi/issues/64
+        # credit for the initial version of this snippet goes to @micahcc
+        jemalloc = prev.jemalloc.overrideAttrs (old: {
+          # --with-lg-page=(log2 page_size)
+          # RPi5 (bcm2712): since our page size is 16384 (2**14), we need 14
+          configureFlags = let
+            pageSizeFlag = "--with-lg-page";
+          in (prev.lib.filter (flag: prev.lib.hasPrefix pageSizeFlag flag == false) old.configureFlags)
+            ++ [ "${pageSizeFlag}=14" ];
+        });
+      })
+    ] else [ ]);
   };
 }