diff --git a/config/nncp-relays.nix b/config/nncp-relays.nix index 2351f1c0..6cc20679 100644 --- a/config/nncp-relays.nix +++ b/config/nncp-relays.nix @@ -20,6 +20,12 @@ noisepub = "DKOHGPPAMSP2RY6PW4UCLOAW4KSCYNFUHZKWQOLPMOIKVGSMS5ZQ"; signpub = "VXF7ZB45L3O6IVFSOTMNTD3UXFO4JZXEU2K2ZARNCJR7OOO6B7SQ"; }; + dvn = { + id = "VWBBK7BQHU7SF3E5KODS7NLCNX54L4SVRC544B2GIX64KCB7A3DQ"; + exchpub = "BVEXUOSFQH7OT2S3PV6CZBMSAQPAMOSCBIINGMRLVSI4KROFSUGQ"; + signpub = "HJLTJ6FVQJL6PWY6CPIQLGV5U6AWHOCY7UWE4EL3TJ2AGTQ4BO5A"; + noisepub = "WMQO7K5KVBVK7HFAROTGHSLYRTYM62ODNRBXZQOEPYKMYLBG2NRA"; + }; emery = { exchpub = "7XICCCEAGTBEPHOZ6LZFK5YIEPQTQ2JDUWFDHHI2VZO7EWAOD4JQ"; id = "BPEPGYPNZVOJM3GJBVRMOWIQA6PE7IIXLKWTDTBAT47N2LUZN4OQ"; diff --git a/hosts/containers/nncp/default.nix b/hosts/containers/nncp/default.nix index d900fb15..3902899b 100644 --- a/hosts/containers/nncp/default.nix +++ b/hosts/containers/nncp/default.nix @@ -27,9 +27,12 @@ }; in lib.mapAttrs (name: value: value // { - calls = lib.optional ((value.addrs or { }) != { }) [ nightCall ]; via = lib.lists.remove "c3d2" value.via; - }) (builtins.removeAttrs config.c3d2.nncp.neigh [ "c3d2" ]); + } // (if (value.addrs or { }) == { } then + { } + else { + calls = [ nightCall ]; + })) (builtins.removeAttrs config.c3d2.nncp.neigh [ "c3d2" ]); }; };