From c9486641ccb3a1d5f1a8d4567246da970cf78659 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Wed, 18 Feb 2026 22:37:10 +0100 Subject: [PATCH] nixberry: use nixpkgs-unstable --- flake.lock | 124 ++++++++++++++++++----------- flake.nix | 6 +- modules/hosts/nixberry/default.nix | 2 +- 3 files changed, 82 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index d49bfe0..d2b1d21 100644 --- a/flake.lock +++ b/flake.lock @@ -1238,11 +1238,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771308899, - "narHash": "sha256-kb/4oSHB261GOLhVGgrzTOqo/ImeCi/WS25q2ujtHGc=", + "lastModified": 1771443511, + "narHash": "sha256-0vp2Se/SEnQ2EOIyeHkbfDwrcBBRwSQ779KHJY05CmE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3e98ba073bd7e2717a07d622f9b737c461a97b9", + "rev": "480118b7c3c01ae99be390bafd0050d9d0726b9f", "type": "github" }, "original": { @@ -1406,12 +1406,8 @@ }, "nixos-images": { "inputs": { - "nixos-stable": [ - "nixpkgs-rpi" - ], - "nixos-unstable": [ - "nixpkgs-rpi" - ] + "nixos-stable": "nixos-stable", + "nixos-unstable": "nixos-unstable" }, "locked": { "lastModified": 1747747741, @@ -1460,24 +1456,58 @@ "flake-compat": "flake-compat_4", "nixos-images": "nixos-images_2", "nixpkgs": [ - "nixpkgs-rpi" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1767359174, - "narHash": "sha256-nLdhnX8/Qm770OhXcT1JPDAh1cwNTIxd+oYS/JLrOn0=", + "lastModified": 1770234826, + "narHash": "sha256-Z0E7bZmgD0NLqnUPC70WwbZnVjHt7AeyfuSoxNyLYp4=", "owner": "Daholli", "repo": "nixos-raspberrypi", - "rev": "909c7245225d59b1cda6b6ce0709e84fe0759364", + "rev": "f93cb0e2ac1ec3a78f3544d2f3bd18b6b5d3b8a8", "type": "github" }, "original": { "owner": "Daholli", - "ref": "develop", "repo": "nixos-raspberrypi", + "rev": "f93cb0e2ac1ec3a78f3544d2f3bd18b6b5d3b8a8", "type": "github" } }, + "nixos-stable": { + "locked": { + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "ref": "nixos-24.11", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" + }, + "original": { + "ref": "nixos-24.11", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" + } + }, + "nixos-unstable": { + "locked": { + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "ref": "nixpkgs-unstable", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" + }, + "original": { + "ref": "nixpkgs-unstable", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" + } + }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_5", @@ -1517,11 +1547,11 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1771436042, - "narHash": "sha256-D5oZ2daVfEYehHxmpFu5xijn4KH65XFMT4uCaxZQ47o=", + "lastModified": 1771449080, + "narHash": "sha256-gMHK6Mt1TgU1WoRSbEH8I6xQYi5GcYf6Dx4Ft91sohw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8032bdf5245e552bff89ee48d9aa48681edd942d", + "rev": "ff37ee0d7279ca4ce555ee5bc94fcb0f58b60b1d", "type": "github" }, "original": { @@ -1533,11 +1563,11 @@ }, "nixpkgs-latest-minecraft": { "locked": { - "lastModified": 1771436042, - "narHash": "sha256-D5oZ2daVfEYehHxmpFu5xijn4KH65XFMT4uCaxZQ47o=", + "lastModified": 1771449080, + "narHash": "sha256-gMHK6Mt1TgU1WoRSbEH8I6xQYi5GcYf6Dx4Ft91sohw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8032bdf5245e552bff89ee48d9aa48681edd942d", + "rev": "ff37ee0d7279ca4ce555ee5bc94fcb0f58b60b1d", "type": "github" }, "original": { @@ -1579,11 +1609,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1771436042, - "narHash": "sha256-D5oZ2daVfEYehHxmpFu5xijn4KH65XFMT4uCaxZQ47o=", + "lastModified": 1771449080, + "narHash": "sha256-gMHK6Mt1TgU1WoRSbEH8I6xQYi5GcYf6Dx4Ft91sohw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8032bdf5245e552bff89ee48d9aa48681edd942d", + "rev": "ff37ee0d7279ca4ce555ee5bc94fcb0f58b60b1d", "type": "github" }, "original": { @@ -1593,22 +1623,6 @@ "type": "github" } }, - "nixpkgs-rpi": { - "locked": { - "lastModified": 1770234462, - "narHash": "sha256-Ab6VqbckLApCrZlj8+HXJkPhMiquUP84osaSOZzA3HI=", - "owner": "nvmd", - "repo": "nixpkgs", - "rev": "071e76e7df3520f30f8a213b37f2f3f4cd96e937", - "type": "github" - }, - "original": { - "owner": "nvmd", - "ref": "modules-with-keys-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1771208521, @@ -1625,13 +1639,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-stable_2": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771208521, + "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -1691,11 +1721,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -1845,7 +1875,7 @@ "nixpkgs-latest-factorio": "nixpkgs-latest-factorio", "nixpkgs-latest-minecraft": "nixpkgs-latest-minecraft", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-rpi": "nixpkgs-rpi", + "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index a03ada4..700106d 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,8 @@ inputs = rec { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default-linux"; + + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; @@ -45,8 +47,8 @@ }; nixos-raspberrypi = { - url = "github:Daholli/nixos-raspberrypi/develop"; - inputs.nixpkgs.follows = "nixpkgs-rpi"; + url = "github:Daholli/nixos-raspberrypi/f93cb0e2ac1ec3a78f3544d2f3bd18b6b5d3b8a8"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nixpkgs-rpi.url = "github:nvmd/nixpkgs/modules-with-keys-25.11"; diff --git a/modules/hosts/nixberry/default.nix b/modules/hosts/nixberry/default.nix index 4ac8b72..e273ab5 100644 --- a/modules/hosts/nixberry/default.nix +++ b/modules/hosts/nixberry/default.nix @@ -25,7 +25,7 @@ topLevel: { ]; }; - boot.loader.raspberryPi.bootloader = "kernel"; + boot.loader.raspberry-pi.bootloader = "kernel"; # hack, homemanager needs it programs.dconf.enable = true;