rpi: add customized installerImages

This commit is contained in:
Christoph Hollizeck 2025-11-22 22:56:27 +01:00
parent 45213e6c64
commit c3397e64f3
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
3 changed files with 96 additions and 10 deletions

82
flake.lock generated
View file

@ -208,7 +208,6 @@
} }
}, },
"flake-compat_4": { "flake-compat_4": {
"flake": false,
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
@ -240,6 +239,22 @@
} }
}, },
"flake-compat_6": { "flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_7": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -1241,6 +1256,30 @@
} }
}, },
"nixos-images": { "nixos-images": {
"inputs": {
"nixos-stable": [
"nixpkgs-rpi"
],
"nixos-unstable": [
"nixpkgs-rpi"
]
},
"locked": {
"lastModified": 1747747741,
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
"owner": "nvmd",
"repo": "nixos-images",
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
"type": "github"
},
"original": {
"owner": "nvmd",
"ref": "sdimage-installer",
"repo": "nixos-images",
"type": "github"
}
},
"nixos-images_2": {
"inputs": { "inputs": {
"nixos-stable": [ "nixos-stable": [
"nixos-raspberrypi", "nixos-raspberrypi",
@ -1269,7 +1308,7 @@
"nixos-raspberrypi": { "nixos-raspberrypi": {
"inputs": { "inputs": {
"argononed": "argononed", "argononed": "argononed",
"nixos-images": "nixos-images", "nixos-images": "nixos-images_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -1287,9 +1326,40 @@
"type": "github" "type": "github"
} }
}, },
"nixos-raspberrypi-installers": {
"inputs": {
"argononed": [
"nixos-raspberrypi",
"argononed"
],
"flake-compat": "flake-compat_4",
"nixos-images": [
"nixos-raspberrypi",
"nixos-images"
],
"nixpkgs": [
"nixos-raspberrypi",
"nixpkgs"
]
},
"locked": {
"lastModified": 1763810751,
"narHash": "sha256-aQ4C2b6eNdgeSg6fTg6Et3Jl8cgOroed/FWymLgPo1g=",
"owner": "Daholli",
"repo": "nixos-raspberrypi",
"rev": "348148e195d8a35540f4913c47c8030cc69933d6",
"type": "github"
},
"original": {
"owner": "Daholli",
"ref": "develop",
"repo": "nixos-raspberrypi",
"type": "github"
}
},
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1589,7 +1659,9 @@
"niri-flake": "niri-flake", "niri-flake": "niri-flake",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-images": "nixos-images",
"nixos-raspberrypi": "nixos-raspberrypi", "nixos-raspberrypi": "nixos-raspberrypi",
"nixos-raspberrypi-installers": "nixos-raspberrypi-installers",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-latest-factorio": "nixpkgs-latest-factorio", "nixpkgs-latest-factorio": "nixpkgs-latest-factorio",
@ -1629,7 +1701,7 @@
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_6",
"git-hooks": "git-hooks_3", "git-hooks": "git-hooks_3",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
@ -1838,7 +1910,7 @@
}, },
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"

View file

@ -30,11 +30,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# nix-ld = {
# url = "github:Mic92/nix-ld";
# inputs.nixpkgs.follows = "nixpkgs-unstable";
# };
nh-flake = { nh-flake = {
url = "github:nix-community/nh"; url = "github:nix-community/nh";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -47,8 +42,22 @@
}; };
nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
nixos-raspberrypi-installers = {
url = "github:Daholli/nixos-raspberrypi/develop";
inputs = {
argononed.follows = "nixos-raspberrypi/argononed";
nixos-images.follows = "nixos-raspberrypi/nixos-images";
nixpkgs.follows = "nixos-raspberrypi/nixpkgs";
};
};
nixpkgs-rpi.url = "github:nvmd/nixpkgs/modules-with-keys-25.05"; nixpkgs-rpi.url = "github:nvmd/nixpkgs/modules-with-keys-25.05";
nixos-images = {
url = "github:nvmd/nixos-images/sdimage-installer";
inputs.nixos-stable.follows = "nixpkgs-rpi";
inputs.nixos-unstable.follows = "nixpkgs-rpi";
};
nix-gaming = { nix-gaming = {
url = "github:fufexan/nix-gaming"; url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";

View file

@ -53,12 +53,17 @@ in
)) ))
]; ];
flake.installerImages = inputs.nixos-raspberrypi-installers.installerImages;
flake.hydraJobs = flake.hydraJobs =
let let
self = inputs.self; self = inputs.self;
in in
{ {
hosts = lib.mapAttrs (_: cfg: cfg.config.system.build.toplevel) self.outputs.nixosConfigurations; hosts = lib.mapAttrs (_: cfg: cfg.config.system.build.toplevel) self.outputs.nixosConfigurations;
installerImages = {
rpi5 = self.outputs.installerImages.rpi5;
};
packages = self.packages; packages = self.packages;
shells = lib.filterAttrs (name: shell: name == "x86_64-linux") self.devShells; shells = lib.filterAttrs (name: shell: name == "x86_64-linux") self.devShells;
}; };