From 140f47649c0a7aa2a49d1f9169859776df15d9ed Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Thu, 21 May 2026 15:55:43 +0100
Subject: [PATCH] commit

---
 config/modules/raspberry-pi.nix | 14 +++++++-------
 flake.lock                      | 17 +++++++++++++++++
 flake.nix                       |  1 +
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/config/modules/raspberry-pi.nix b/config/modules/raspberry-pi.nix
index 4182fb1..d42e3a4 100644
--- a/config/modules/raspberry-pi.nix
+++ b/config/modules/raspberry-pi.nix
@@ -7,16 +7,15 @@
 }: {
   flake-file.inputs = {
     raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
   modules.raspberry-pi = {
     provides = {
       "5" = {
-        nixos = {pkgs, ...}: let
-          rpi-pi = inputs.raspberry-pi-nix;
-        in {
+        nixos = {pkgs, modulesPath, ...}: {
           imports = [
-            rpi-pi.nixosModules.raspberry-pi
-            rpi-pi.nixosModules.sd-image
+            inputs.nixos-hardware.nixosModules.raspberry-pi-5
+            "${modulesPath}/installer/sd-card/sd-image-aarch64.nix"
           ];
 
           environment.systemPackages = with pkgs; [
@@ -24,10 +23,11 @@
           ];
 
           sdImage.compressImage = false;
-          raspberry-pi-nix.board = "bcm2712"; # Rpi 5 - 64bit
+          # raspberry-pi-nix.board = "bcm2712"; # Rpi 5 - 64bit
           # We need to rebuild kernel for 6.12
           # raspberry-pi-nix.kernel-version = "v6_12_17";
-          raspberry-pi-nix.uboot.enable = false;
+          # raspberry-pi-nix.uboot.enable = false;
+          boot.initrd.systemd.enableTpm2 = false;
 
           hardware.enableRedistributableFirmware = true;
         };
diff --git a/flake.lock b/flake.lock
index e88ec30..1d78348 100644
--- a/flake.lock
+++ b/flake.lock
@@ -912,6 +912,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1779258371,
+        "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1778036283,
@@ -1204,6 +1220,7 @@
         "nik-pkgs": "nik-pkgs",
         "niri-flake": "niri-flake",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim",
         "omp-nix": "omp-nix",
diff --git a/flake.nix b/flake.nix
index 390e47e..96bcbb8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
     nixvim.url = "github:nix-community/nixvim";
     omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";