network.nix: simplify import of main config

This commit is contained in:
Erik Arvstedt 2019-11-27 14:04:18 +01:00
parent 7e021a2629
commit bbf2bbc04a
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
1 changed files with 4 additions and 5 deletions

View File

@ -75,10 +75,9 @@ in {
network.description = "Bitcoin Core node";
bitcoin-node =
{ config, pkgs, ... }:
let
bitcoin-node = import ../configuration.nix;
in {
{ config, pkgs, ... }: {
imports = [ ../configuration.nix ];
deployment.keys = {
inherit bitcoin-rpcpassword;
}
@ -88,5 +87,5 @@ in {
// (if (config.services.liquidd.enable) then { inherit liquid-rpcpassword; } else { })
// (if (config.services.spark-wallet.enable) then { inherit spark-wallet-login; } else { })
// (if (config.services.electrs.enable) then { inherit nginx_key nginx_cert; } else { });
} // (bitcoin-node { inherit config pkgs; });
};
}