toki/aether
1
0
Fork 0
Code Issues Pull requests Activity

refactor(deploy-rpi5): switch to nixos-hardware module

Browse source
This commit is contained in:
Kiana Sheibani 2025-04-06 02:33:03 -04:00
parent a48005eec4
commit 7501370ae9
Signed by: toki
GPG key ID: 6CB106C25E86A9F7
3 changed files with 30 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.nix
View file

@ -3,9 +3,7 @@ description = "Aether - web server configuration";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
rpi5-kernel.url = "gitlab:vriska/nix-rpi5";
rpi5-kernel.inputs.nixpkgs.follows = "nixpkgs";
nixos-hardware.url = "github:NixOS/nixos-hardware";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
@ -15,7 +13,7 @@ inputs = {
forgejo-tokyo-night.flake = false;
};
outputs = inputs@{ self, nixpkgs, agenix, rpi5-kernel, ... }:
outputs = inputs@{ self, nixpkgs, nixos-hardware, agenix, ... }:
let
inherit (nixpkgs) lib;
@ -23,8 +21,7 @@ outputs = inputs@{ self, nixpkgs, agenix, rpi5-kernel, ... }:
# (Mostly used for injecting flake inputs)
extraConfig = {
deploy-rpi5 = {
aether.deploy.rpi5._internal.kernelPackages = lib.mkDefault
rpi5-kernel.legacyPackages.aarch64-linux.linuxPackages_rpi5;
imports = [ nixos-hardware.nixosModules.raspberry-pi-5 ];
};
};
@ -47,11 +44,11 @@ outputs = inputs@{ self, nixpkgs, agenix, rpi5-kernel, ... }:
(name: ./deploy/${lib.removePrefix "deploy-" name});
modulesWithCfg = builtins.mapAttrs (k: v: {
imports = [ v ];
} // extraConfig.${k} or {}) modules;
imports = [ v (extraConfig.${k} or {}) ];
}) modules;
deploymentsWithCfg = builtins.mapAttrs (k: v: {
imports = [ v ];
} // extraConfig.${k} or {}) deployments;
imports = [ v (extraConfig.${k} or {}) ];
}) deployments;
in {
nixosModules =
modulesWithCfg // deploymentsWithCfg // {