Remove "rec" from flake output
This commit is contained in:
parent
a39bad4f85
commit
72830ddc21
11
flake.nix
11
flake.nix
|
@ -21,12 +21,13 @@
|
||||||
}) ];
|
}) ];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rec {
|
{
|
||||||
lib =
|
lib = nixpkgs.lib.extend (final: prev:
|
||||||
import ./nix/lib {
|
import ./nix/lib {
|
||||||
inherit self nixpkgs;
|
inherit self;
|
||||||
inherit (zentralwerk-network-key.lib) gpgKey;
|
inherit (zentralwerk-network-key.lib) gpgKey;
|
||||||
};
|
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
});
|
||||||
|
|
||||||
packages = forAllSystems (system:
|
packages = forAllSystems (system:
|
||||||
import ./nix/pkgs { inherit self nixpkgs system; }
|
import ./nix/pkgs { inherit self nixpkgs system; }
|
||||||
|
@ -40,7 +41,7 @@
|
||||||
builtins.mapAttrs (hostName: _: nixosConfig hostName) (
|
builtins.mapAttrs (hostName: _: nixosConfig hostName) (
|
||||||
nixpkgs.lib.filterAttrs (_: { role, ... }:
|
nixpkgs.lib.filterAttrs (_: { role, ... }:
|
||||||
builtins.elem role [ "server" "container" ]
|
builtins.elem role [ "server" "container" ]
|
||||||
) lib.config.site.hosts
|
) self.lib.config.site.hosts
|
||||||
);
|
);
|
||||||
|
|
||||||
# nixosConfigurations.test_vm =
|
# nixosConfigurations.test_vm =
|
||||||
|
|
|
@ -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; };
|
config = import ./config { inherit self pkgs gpgKey; };
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
{ self, config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (config.networking) hostName;
|
inherit (config.networking) hostName;
|
||||||
inherit (lib) optional;
|
inherit (lib) optional;
|
||||||
|
|
||||||
hostConfig = self.lib.config.site.hosts.${hostName};
|
hostConfig = lib.config.site.hosts.${hostName};
|
||||||
in
|
in {
|
||||||
builtins.trace (lib.generators.toPretty {} self.lib.config) {
|
|
||||||
imports = [
|
imports = [
|
||||||
#{ config = self.lib.config; }
|
#{ config = self.lib.config; }
|
||||||
./defaults.nix
|
./defaults.nix
|
||||||
|
|
Loading…
Reference in New Issue