kartei/janik: lib -> slib

This commit is contained in:
makefu 2023-08-18 16:19:24 +02:00
parent 00c87e9065
commit e157ffa728
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -1,12 +1,12 @@
with import ../../lib; { config, lib, ... }: let
{ config, ... }: let slib = import ../../lib/pure.nix { inherit lib; };
hostDefaults = hostName: host: flip recursiveUpdate host ({ hostDefaults = hostName: host: lib.flip lib.recursiveUpdate host ({
ci = false; ci = false;
external = true; external = true;
monitoring = false; monitoring = false;
} // optionalAttrs (host.nets?retiolum) { } // lib.optionalAttrs (host.nets?retiolum) {
nets.retiolum.ip6.addr = nets.retiolum.ip6.addr =
(krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; (slib.krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
}); });
in { in {
users.janik = { users.janik = {
@ -16,7 +16,7 @@ in {
owner = config.krebs.users.janik; owner = config.krebs.users.janik;
nets.retiolum = { nets.retiolum = {
aliases = [ "hertz.janik.r" ]; aliases = [ "hertz.janik.r" ];
ip6.addr = (lib.krebs.genipv6 "retiolum" "janik" { hostName = "hertz"; }).address; ip6.addr = (slib.krebs.genipv6 "retiolum" "janik" { hostName = "hertz"; }).address;
tinc.pubkey = '' tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEA0mqxrdVU9wFhNZYGWEknJpKV4yIodNlaCIKDPVhU5wmlzh2szKUS MIICCgKCAgEA0mqxrdVU9wFhNZYGWEknJpKV4yIodNlaCIKDPVhU5wmlzh2szKUS