fix infinite recursion

This commit is contained in:
Vivian 2023-05-31 16:45:10 +02:00
parent da52e4c695
commit f42290bb1c
6 changed files with 110 additions and 165 deletions

View file

@ -44,16 +44,8 @@
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, nixvim, ... }@inputs:
let
inherit (nixpkgs) lib;
@ -87,8 +79,7 @@
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") {
@ -100,34 +91,20 @@
}).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;
default = colmena.packages.${system}.colmena;
iso = nixos-generators.nixosGenerate {
inherit system pkgs;
format = "install-iso";
modules = [ (import ./nixos/templates/iso.nix) ];
};
iso-graphical = nixos-generators.nixosGenerate {
inherit system pkgs;
format = "install-iso";
modules = [ (import ./nixos/templates/iso-graphical.nix) ];
};
proxmox-lxc = nixos-generators.nixosGenerate {
inherit pkgs;
inherit system pkgs specialArgs;
format = "proxmox-lxc";
modules = util.base_imports
++ [ (import ./nixos/templates/proxmox-lxc.nix) ];
@ -135,7 +112,7 @@
# Broken
# proxmox-vm = nixos-generators.nixosGenerate {
# inherit system pkgs;
# inherit system pkgs specialArgs;
# format = "proxmox";
# modules = util.base_imports
# ++ [ (import ./nixos/templates/proxmox-vm.nix) ];