From ae1230e13b81bf6707ffe4572d6ccf8d6a7bef3a Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Wed, 10 Jun 2020 15:31:57 +0000
Subject: [PATCH] clightning: remove bitcoin-rpcuser option

Simplifies the clightning module.
---
 modules/clightning.nix          | 8 +-------
 modules/presets/secure-node.nix | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/clightning.nix b/modules/clightning.nix
index 3bb516f..14574c9 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -12,7 +12,7 @@ let
     ${optionalString (cfg.proxy != null) "proxy=${cfg.proxy}"}
     always-use-proxy=${if cfg.always-use-proxy then "true" else "false"}
     ${optionalString (cfg.bind-addr != null) "bind-addr=${cfg.bind-addr}"}
-    bitcoin-rpcuser=${cfg.bitcoin-rpcuser}
+    bitcoin-rpcuser=${config.services.bitcoind.rpcuser}
     rpc-file-mode=0660
   '';
 in {
@@ -54,12 +54,6 @@ in {
       default = false;
       description = "Announce clightning Tor Hidden Service";
     };
-    bitcoin-rpcuser = mkOption {
-      type = types.str;
-      description = ''
-        Bitcoin RPC user
-      '';
-    };
     dataDir = mkOption {
       type = types.path;
       default = "/var/lib/clightning";
diff --git a/modules/presets/secure-node.nix b/modules/presets/secure-node.nix
index 7ffdb86..0f5c634 100644
--- a/modules/presets/secure-node.nix
+++ b/modules/presets/secure-node.nix
@@ -75,7 +75,6 @@ in {
 
     # clightning
     services.clightning = {
-      bitcoin-rpcuser = cfg.bitcoind.rpcuser;
       proxy = cfg.tor.client.socksListenAddress;
       enforceTor = true;
       always-use-proxy = true;