diff --git a/flake.nix b/flake.nix index b841a2a..63ea274 100644 --- a/flake.nix +++ b/flake.nix @@ -94,9 +94,20 @@ modules = [ { 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; } - nixos-uconsole.nixosModules.uconsole-cm5 + # Use uconsole kernel module only (not the full uconsole-cm5 which has broken deps) + nixos-uconsole.nixosModules.kernel ./hosts/uconsole/configuration.nix ./hosts/uconsole/hardware-configuration.nix ]; diff --git a/hosts/uconsole/configuration.nix b/hosts/uconsole/configuration.nix index 24cbfeb..c7f09dc 100644 --- a/hosts/uconsole/configuration.nix +++ b/hosts/uconsole/configuration.nix @@ -2,20 +2,8 @@ { # --- CORE HARDWARE (CM5 / RPi5) --- - # nixos-uconsole.nixosModules.uconsole-cm5 imported in flake.nix - - uconsole = { - enable = true; - variant = "cm5"; # Hardware target: CM5/RPi5 - # Fixes the landscape orientation at boot - videoMode = "720x1280M@60D,panel_orientation=right_side_up"; - }; - - # Firmware for Wi-Fi and Bluetooth - hardware.enableRedistributableFirmware = true; - - # Enable GPU acceleration (VideoCore VII) - hardware.graphics.enable = true; + # Manual config in flake.nix (nixos-uconsole.nixosModules.kernel provides CM5 kernel) + # nixos-uconsole.nixosModules.uconsole-cm5 has broken hardware.raspberry-pi dependencies # --- BASIC HOST INFO --- networking.hostName = "uConsole";