various updates

This commit is contained in:
Vivian 2023-05-30 09:58:17 +02:00
parent 53658c2a77
commit 5b3ac6c316
9 changed files with 76 additions and 21 deletions

View file

@ -44,8 +44,16 @@
vault-unseal.url = "git+https://git.0x76.dev/v/vault-unseal.git";
};
outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena
, nixos-generators, nur, ... }@inputs:
outputs =
{ self
, nixpkgs
, nixpkgs_22-11
, vault-secrets
, colmena
, nixos-generators
, nur
, ...
}@inputs:
let
inherit (nixpkgs) lib;
@ -79,7 +87,8 @@
source /etc/set-environment
nix repl --file "${./.}/repl.nix" $@
'';
in {
in
{
# Make the nixosConfigurations for compat reasons (e.g. vault)
nixosConfigurations =
(import (inputs.colmena + "/src/nix/hive/eval.nix") {
@ -91,12 +100,14 @@
}).nodes;
# Make the colmena configuration
colmena = lib.foldr (el: acc: acc // util.mkColmenaHost el) {
meta = {
inherit specialArgs;
nixpkgs = pkgs;
};
} nixHosts;
colmena = lib.foldr (el: acc: acc // util.mkColmenaHost el)
{
meta = {
inherit specialArgs;
nixpkgs = pkgs;
};
}
nixHosts;
packages.${system} = {
inherit apply-local;