diff --git a/examples/README.md b/examples/README.md index 6997ad9..d7c9d39 100644 --- a/examples/README.md +++ b/examples/README.md @@ -55,7 +55,7 @@ The [nix-bitcoin test suite](../test/README.md) is also useful for exploring fea ### Real-world example Check the [server repo](https://github.com/fort-nix/nixbitcoin.org) for https://nixbitcoin.org -to see the configuration of a nix-bitcoin node that's used in production. +to see the configuration of a Flakes-based nix-bitcoin node that's used in production. The commands in `shell.nix` allow you to locally run the node in a VM or container. diff --git a/modules/clightning-plugins/clboss.nix b/modules/clightning-plugins/clboss.nix index bec8b07..ebe1eac 100644 --- a/modules/clightning-plugins/clboss.nix +++ b/modules/clightning-plugins/clboss.nix @@ -17,8 +17,8 @@ let cfg = config.services.clightning.plugins.clboss; in default = 30000; description = mdDoc '' Target amount (in satoshi) that CLBOSS will leave on-chain. - clboss will only open new channels if this amount is smaller than - the funds in your clightning wallet. + clboss will only open new channels if the funds in your clightning wallet are + larger than this amount. ''; }; min-channel = mkOption { diff --git a/modules/presets/bitcoind-remote.nix b/modules/presets/bitcoind-remote.nix index 1d5c399..4ada69a 100644 --- a/modules/presets/bitcoind-remote.nix +++ b/modules/presets/bitcoind-remote.nix @@ -5,7 +5,9 @@ let secretsDir = config.nix-bitcoin.secretsDir; in { services.bitcoind = { - # Make the local bitcoin-cli work with the remote node + # Make the local bitcoin-cli work with the remote node. + # Without this, bitcoin-cli would try to use the .cookie file in the local + # bitcoind data dir for authorization, which doesn't exist. extraConfig = '' rpcuser=${cfg.rpc.users.privileged.name} ''; diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index 11eb059..3ea2f42 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -39,7 +39,6 @@ rec { ## Specific versions of packages that already exist in nixpkgs # cryptography 3.3.2, required by joinmarketdaemon - # Used in the private python package set for joinmarket (../joinmarket/default.nix) cryptography = callPackage ./specific-versions/cryptography { openssl = super.pkgs.openssl_1_1; cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {};