patrick/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Wiki Activity

fix: colmena applied overlays twice

Browse source
This commit is contained in:
Patrick 2023-09-25 15:59:07 +02:00
parent 2d39fbbb7e
commit 9efaa63cca
Signed by: patrick
GPG key ID: 451F95EFB8BECD0F
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/optional/secureboot.nix
View file

@ -6,7 +6,10 @@
}: {
environment.systemPackages = [
# For debugging and troubleshooting Secure Boot.
pkgs.sbctl
pkgs.sbctl.override
{
databasePath = "/run/secureboot";
}
];
age.secrets.secureboot.rekeyFile = ../../hosts/${config.node.name}/secrets/secureboot.tar.age;
system.activationScripts.securebootuntar = {

6
nix/hosts.nix
View file

@ -55,7 +55,11 @@ inputs: let
meta = {
# Just a required dummy for colmena, overwritten on a per-node basis by nodeNixpkgs below.
nixpkgs = self.pkgs.x86_64-linux;
nodeNixpkgs = mapNixosConfigs (v: v.pkgs);
nodeNixpkgs = mapNixosConfigs (v:
import inputs.nixpkgs {
inherit (v._module.args.pkgs.stdenv.hostPlatform) system;
inherit (v._module.args.pkgs) config;
});
nodeSpecialArgs = mapNixosConfigs (v: v._module.specialArgs);
};
}