feat(npins): Update nix-lib
This commit is contained in:
parent
779f3f3d9e
commit
9236bed612
13
hive.nix
13
hive.nix
|
@ -2,7 +2,7 @@ let
|
||||||
sources = import ./npins;
|
sources = import ./npins;
|
||||||
metadata = import ./meta;
|
metadata = import ./meta;
|
||||||
|
|
||||||
lib = import (sources.nix-lib + "/trivial.nix");
|
lib = import (sources.nix-lib + "/src/trivial.nix");
|
||||||
|
|
||||||
mkNode = node: { name, nodes, ... }: {
|
mkNode = node: { name, nodes, ... }: {
|
||||||
# Import the base configuration for each node
|
# Import the base configuration for each node
|
||||||
|
@ -34,9 +34,14 @@ let
|
||||||
|
|
||||||
mkNixpkgs' = node: import (mkNixpkgs node) { };
|
mkNixpkgs' = node: import (mkNixpkgs node) { };
|
||||||
|
|
||||||
mkArgs = node: {
|
mkArgs = node:
|
||||||
nix-lib = import sources.nix-lib { inherit ((mkNixpkgs' node)) lib; keysRoot = ./keys; };
|
let lib' = (mkNixpkgs' node).lib;
|
||||||
};
|
in {
|
||||||
|
lib = import sources.nix-lib {
|
||||||
|
lib = lib';
|
||||||
|
keysRoot = ./keys;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
nodes = builtins.attrNames metadata.nodes;
|
nodes = builtins.attrNames metadata.nodes;
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ nix-lib, sources, ... }:
|
{ lib, sources, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = (nix-lib.mkImports ./. [
|
imports = (lib.extra.mkImports ./. [
|
||||||
"krz-access-control"
|
"krz-access-control"
|
||||||
"krz-ssh"
|
"krz-ssh"
|
||||||
]) ++ [
|
]) ++ [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, nix-lib, meta, name, ... }:
|
{ config, lib, meta, name, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
|
@ -39,7 +39,7 @@ in
|
||||||
krz-access-control.users.root = mkDefault admins;
|
krz-access-control.users.root = mkDefault admins;
|
||||||
|
|
||||||
users.users = builtins.mapAttrs
|
users.users = builtins.mapAttrs
|
||||||
(u: members: { openssh.authorizedKeys.keys = nix-lib.getAllKeys members; })
|
(u: members: { openssh.authorizedKeys.keys = lib.extra.getAllKeys members; })
|
||||||
cfg.users;
|
cfg.users;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
},
|
},
|
||||||
"pre_releases": false,
|
"pre_releases": false,
|
||||||
"version_upper_bound": null,
|
"version_upper_bound": null,
|
||||||
"version": "0.1.1",
|
"version": "0.1.6",
|
||||||
"revision": "5db2443e2cb18335375ad84ffbc066a239c054de",
|
"revision": "ffb3dfa4c146d48300bd4fa625acfe48e091a734",
|
||||||
"url": null,
|
"url": null,
|
||||||
"hash": "18xzi2yn2vk7zq79pgz8z2s1ijhyjcx5866mp21rrdi9gz37yiif"
|
"hash": "1frsja071qqx6p7rjnijzhidqfylx0ipzqpmjdvj4jl89h34vrhr"
|
||||||
},
|
},
|
||||||
"nixos-23.05": {
|
"nixos-23.05": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
|
|
Loading…
Reference in a new issue