Remove "rec" from flake output

This commit is contained in:
Ehmry - 2021-03-22 20:25:50 +01:00 committed by Astro
parent a39bad4f85
commit 72830ddc21
3 changed files with 10 additions and 13 deletions

View File

@ -21,12 +21,13 @@
}) ];
};
in
rec {
lib =
{
lib = nixpkgs.lib.extend (final: prev:
import ./nix/lib {
inherit self nixpkgs;
inherit self;
inherit (zentralwerk-network-key.lib) gpgKey;
};
pkgs = nixpkgs.legacyPackages.x86_64-linux;
});
packages = forAllSystems (system:
import ./nix/pkgs { inherit self nixpkgs system; }
@ -40,7 +41,7 @@
builtins.mapAttrs (hostName: _: nixosConfig hostName) (
nixpkgs.lib.filterAttrs (_: { role, ... }:
builtins.elem role [ "server" "container" ]
) lib.config.site.hosts
) self.lib.config.site.hosts
);
# nixosConfigurations.test_vm =

View File

@ -1,8 +1,5 @@
{ self, nixpkgs, gpgKey }:
{ self, gpgKey, pkgs }:
let
pkgs = nixpkgs.legacyPackages.x86_64-linux;
in
{
config = import ./config { inherit self pkgs gpgKey; };

View File

@ -1,12 +1,11 @@
{ self, config, lib, ... }:
{ config, lib, ... }:
let
inherit (config.networking) hostName;
inherit (lib) optional;
hostConfig = self.lib.config.site.hosts.${hostName};
in
builtins.trace (lib.generators.toPretty {} self.lib.config) {
hostConfig = lib.config.site.hosts.${hostName};
in {
imports = [
#{ config = self.lib.config; }
./defaults.nix