From 3bd4fcc1c698f2dfbe58dab6ae5342063a2b6ccd Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@lazyworkhorse.net>
Date: Wed, 29 Apr 2026 19:45:34 +0000
Subject: [PATCH] fix: add nixos-raspberrypi input for uConsole CM5 support

- uconsole-cm5 module requires hardware.raspberry-pi options from nixos-raspberrypi
- Import raspberry-pi-5.base before uconsole-cm5 module
- Uses nixos-25.05 for both inputs (compatible versions)
---
 flake.nix                        | 22 ++++++++++------------
 hosts/uconsole/configuration.nix |  3 +--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 63ea274..49b8465 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,12 +12,17 @@
       url = "git+https://git.lix.systems/lix-project/lix?ref=main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # uConsole CM5 hardware support (uses nixos-25.05 for hardware.raspberry-pi support)
+    # uConsole CM5 hardware support
     nixpkgs-uconsole.url = "github:nixos/nixpkgs/nixos-25.05";
     nixos-uconsole = {
       url = "github:nixos-uconsole/nixos-uconsole";
       inputs.nixpkgs.follows = "nixpkgs-uconsole";
     };
+    # nixos-raspberrypi provides hardware.raspberry-pi options that uconsole-cm5 needs
+    nixos-raspberrypi = {
+      url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
+      inputs.nixpkgs.follows = "nixpkgs-uconsole";
+    };
     # Raspberry Pi 5 hardware support
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
     self.submodules = true;
@@ -96,18 +101,11 @@
                 nixpkgs.config.allowUnfree = true;
                 nixpkgs.hostPlatform = "aarch64-linux";
                 nix.package = lix.packages."aarch64-linux".default;
-                
-                # Manual uConsole CM5 hardware setup (nixos-uconsole module has broken hardware.raspberry-pi deps)
-                # Display: 720x1280 landscape, panel on right side up
-                boot.kernelParams = [
-                  "video=DSI-1:720x1280M@60D,panel_orientation=right_side_up"
-                  "console=tty1"
-                ];
-                hardware.enableRedistributableFirmware = true;
-                hardware.graphics.enable = true;
               }
-              # Use uconsole kernel module only (not the full uconsole-cm5 which has broken deps)
-              nixos-uconsole.nixosModules.kernel
+              # Raspberry Pi 5 base (provides hardware.raspberry-pi options)
+              nixos-raspberrypi.nixosModules.raspberry-pi-5.base
+              # uConsole CM5 hardware support (display, kernel, config)
+              nixos-uconsole.nixosModules.uconsole-cm5
               ./hosts/uconsole/configuration.nix
               ./hosts/uconsole/hardware-configuration.nix
             ];
diff --git a/hosts/uconsole/configuration.nix b/hosts/uconsole/configuration.nix
index c7f09dc..0dfe1c4 100644
--- a/hosts/uconsole/configuration.nix
+++ b/hosts/uconsole/configuration.nix
@@ -2,8 +2,7 @@
 
 {
   # --- CORE HARDWARE (CM5 / RPi5) ---
-  # Manual config in flake.nix (nixos-uconsole.nixosModules.kernel provides CM5 kernel)
-  # nixos-uconsole.nixosModules.uconsole-cm5 has broken hardware.raspberry-pi dependencies
+  # nixos-raspberrypi.nixosModules.raspberry-pi-5.base + nixos-uconsole.nixosModules.uconsole-cm5 imported in flake.nix
 
   # --- BASIC HOST INFO ---
   networking.hostName = "uConsole";