uConsole: use mkUConsoleSystem instead of manual nixosSystem

Using nixos-uconsole.lib.mkUConsoleSystem ensures the exact same
module composition as the pre-built image, so the kernel derivation
hash matches what'\''s already in the store (6.12.47).
This commit is contained in:
2026-06-09 20:16:31 -04:00
parent 52fa439409
commit 644c9a7645

View File

@@ -23,7 +23,6 @@
url = "github:nvmd/nixos-raspberrypi/v1.20260317.0"; url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
inputs.nixpkgs.follows = "nixos-uconsole/nixpkgs"; inputs.nixpkgs.follows = "nixos-uconsole/nixpkgs";
}; };
self.submodules = true;
}; };
outputs = { self, nixpkgs, agenix, disko, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs: outputs = { self, nixpkgs, agenix, disko, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
@@ -92,18 +91,17 @@
]; ];
}; };
uConsole = nixos-raspberrypi.lib.nixosSystem { uConsole = nixos-uconsole.lib.mkUConsoleSystem {
variant = "cm5";
specialArgs = { inherit self keys paths inputs nixos-raspberrypi; }; specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
modules = [ modules = [
{ {
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.config.permittedInsecurePackages = [
# Use nixpkgs default nix — lix dev breaks with stable 25.11 "openclaw-2026.3.12"
# nix.package = lix.packages."aarch64-linux".default; ];
} }
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
nixos-uconsole.nixosModules.uconsole-cm5
disko.nixosModules.disko disko.nixosModules.disko
./hosts/uConsole/configuration.nix ./hosts/uConsole/configuration.nix
./hosts/uConsole/hardware-configuration.nix ./hosts/uConsole/hardware-configuration.nix