greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add 'nix-bitcoin-services' option

Browse Source 
1. Makes the content easily accessible for module users
2. Avoids needlessly recalculating the attrset in every client module
This commit is contained in:
Erik Arvstedt 2019-11-27 14:04:23 +01:00
parent 7aaf30501c
commit f0a36fe0c7
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
13 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bitcoind.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.bitcoind; cfg = config.services.bitcoind;
inherit (config) nix-bitcoin-services;
pidFile = "${cfg.dataDir}/bitcoind.pid"; pidFile = "${cfg.dataDir}/bitcoind.pid";
configFile = pkgs.writeText "bitcoin.conf" '' configFile = pkgs.writeText "bitcoin.conf" ''
${optionalString cfg.testnet "testnet=1"} ${optionalString cfg.testnet "testnet=1"}

2
modules/clightning.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.clightning; cfg = config.services.clightning;
inherit (config) nix-bitcoin-services;
configFile = pkgs.writeText "config" '' configFile = pkgs.writeText "config" ''
autolisten=${if cfg.autolisten then "true" else "false"} autolisten=${if cfg.autolisten then "true" else "false"}
network=bitcoin network=bitcoin

2
modules/electrs.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.electrs; cfg = config.services.electrs;
inherit (config) nix-bitcoin-services;
index-batch-size = "${if cfg.high-memory then "" else "--index-batch-size=10"}"; index-batch-size = "${if cfg.high-memory then "" else "--index-batch-size=10"}";
jsonrpc-import = "${if cfg.high-memory then "" else "--jsonrpc-import"}"; jsonrpc-import = "${if cfg.high-memory then "" else "--jsonrpc-import"}";
in { in {

2
modules/lightning-charge.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.lightning-charge; cfg = config.services.lightning-charge;
inherit (config) nix-bitcoin-services;
in { in {
options.services.lightning-charge = { options.services.lightning-charge = {
enable = mkOption { enable = mkOption {

2
modules/liquid.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.liquidd; cfg = config.services.liquidd;
inherit (config) nix-bitcoin-services;
pidFile = "${cfg.dataDir}/liquidd.pid"; pidFile = "${cfg.dataDir}/liquidd.pid";
configFile = pkgs.writeText "elements.conf" '' configFile = pkgs.writeText "elements.conf" ''
chain=liquidv1 chain=liquidv1

2
modules/lnd.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.lnd; cfg = config.services.lnd;
inherit (config) nix-bitcoin-services;
configFile = pkgs.writeText "lnd.conf" '' configFile = pkgs.writeText "lnd.conf" ''
datadir=${cfg.dataDir} datadir=${cfg.dataDir}
logdir=${cfg.dataDir}/logs logdir=${cfg.dataDir}/logs

17
modules/modules.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
let let
nixpkgs-pinned = import ../pkgs/nixpkgs-pinned.nix; nixpkgs-pinned = import ../pkgs/nixpkgs-pinned.nix;
unstable = import nixpkgs-pinned.nixpkgs-unstable {}; unstable = import nixpkgs-pinned.nixpkgs-unstable {};
@ -27,7 +27,16 @@ in {
disabledModules = [ "services/networking/bitcoind.nix" ]; disabledModules = [ "services/networking/bitcoind.nix" ];
nixpkgs.overlays = [ (self: super: { options = {
nix-bitcoin = allPackages super; nix-bitcoin-services = lib.mkOption {
}) ]; readOnly = true;
default = import ./nix-bitcoin-services.nix lib;
};
};
config = {
nixpkgs.overlays = [ (self: super: {
nix-bitcoin = allPackages super;
}) ];
};
} }

2
modules/nanopos.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.nanopos; cfg = config.services.nanopos;
inherit (config) nix-bitcoin-services;
defaultItemsFile = pkgs.writeText "items.yaml" '' defaultItemsFile = pkgs.writeText "items.yaml" ''
tea: tea:
price: 0.02 # denominated in the currency specified by --currency price: 0.02 # denominated in the currency specified by --currency

2
modules/nix-bitcoin-services.nix
View File

@ -1,7 +1,7 @@
# See `man systemd.exec` and `man systemd.resource-control` for an explanation # See `man systemd.exec` and `man systemd.resource-control` for an explanation
# of the various systemd options available through this module. # of the various systemd options available through this module.
{ config, lib, pkgs, ... }: lib:
with lib; with lib;
{ {

2
modules/nix-bitcoin-webindex.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.nix-bitcoin-webindex; cfg = config.services.nix-bitcoin-webindex;
inherit (config) nix-bitcoin-services;
indexFile = pkgs.writeText "index.html" '' indexFile = pkgs.writeText "index.html" ''
<html> <html>
<body> <body>

2
modules/onion-chef.nix
View File

@ -8,8 +8,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.onion-chef; cfg = config.services.onion-chef;
inherit (config) nix-bitcoin-services;
dataDir = "/var/lib/onion-chef/"; dataDir = "/var/lib/onion-chef/";
onion-chef-script = pkgs.writeScript "onion-chef.sh" '' onion-chef-script = pkgs.writeScript "onion-chef.sh" ''
# wait until tor is up # wait until tor is up

2
modules/recurring-donations.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.recurring-donations; cfg = config.services.recurring-donations;
inherit (config) nix-bitcoin-services;
recurring-donations-script = pkgs.writeScript "recurring-donations.sh" '' recurring-donations-script = pkgs.writeScript "recurring-donations.sh" ''
LNCLI="lightning-cli --lightning-dir=${config.services.clightning.dataDir}" LNCLI="lightning-cli --lightning-dir=${config.services.clightning.dataDir}"
pay_tallycoin() { pay_tallycoin() {

2
modules/spark-wallet.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
let let
nix-bitcoin-services = pkgs.callPackage ./nix-bitcoin-services.nix { };
cfg = config.services.spark-wallet; cfg = config.services.spark-wallet;
inherit (config) nix-bitcoin-services;
dataDir = "/var/lib/spark-wallet/"; dataDir = "/var/lib/spark-wallet/";
onion-chef-service = (if cfg.onion-service then [ "onion-chef.service" ] else []); onion-chef-service = (if cfg.onion-service then [ "onion-chef.service" ] else []);
run-spark-wallet = pkgs.writeScript "run-spark-wallet" '' run-spark-wallet = pkgs.writeScript "run-spark-wallet" ''