- Move modules/vendor/nix-bitcoin/* -> modules/bitcoin/* (clean, Sovran-owned)
* modules/bitcoin/default.nix imports the 6 tailored services
* modules/bitcoin/common.nix bundles secrets/onion/lib
* modules/bitcoin/stubs.nix kept minimal (no clightning)
* packages/lndinit/default.nix replaces pkgs/sovran-overlay.nix
(lnd.nix now uses pkgs.callPackage ../../packages/lndinit {})
- Remove pkgs/sovran-overlay.nix, pkgs/nbxplorer.nix, pkgs/README.md
* No global overlay - lndinit is a normal package in packages/
- Remove modules/vendor/ entirely
- Update flake.nix: drop overlay-sovran, import ./modules/bitcoin
instead of ./modules/vendor/nix-bitcoin/modules.nix
- No more random vendor/ or pkgs/ dirs - follows Sovran convention:
modules/ for NixOS modules, packages/ for packages
61 lines
1.6 KiB
Nix
61 lines
1.6 KiB
Nix
{ config, pkgs, lib, ... }:
|
|
|
|
with lib;
|
|
{
|
|
options = {
|
|
nix-bitcoin = {
|
|
# Kept for compatibility, now simply aliases system pkgs
|
|
pkgs = mkOption {
|
|
type = types.attrs;
|
|
default = pkgs;
|
|
defaultText = "pkgs";
|
|
description = "Alias to system pkgs (vendored nix-bitcoin now uses nixpkgs directly).";
|
|
};
|
|
|
|
useVersionLockedPkgs = mkOption {
|
|
type = types.bool;
|
|
default = false;
|
|
description = "Deprecated — vendored modules always use system pkgs.";
|
|
};
|
|
|
|
pkgOverlays = mkOption {
|
|
internal = true;
|
|
type = with types; functionTo attrs;
|
|
default = _: _: {};
|
|
description = "Deprecated stub.";
|
|
};
|
|
|
|
lib = mkOption {
|
|
readOnly = true;
|
|
default = import ./lib.nix lib pkgs config;
|
|
defaultText = "vendor/nix-bitcoin/lib.nix";
|
|
};
|
|
|
|
torClientAddressWithPort = mkOption {
|
|
readOnly = true;
|
|
default = with config.services.tor.client.socksListenAddress;
|
|
"${addr}:${toString port}";
|
|
defaultText = "(See source)";
|
|
};
|
|
|
|
torify = mkOption {
|
|
readOnly = true;
|
|
default = pkgs.writers.writeBashBin "torify" ''
|
|
${pkgs.tor}/bin/torify \
|
|
--address ${config.services.tor.client.socksListenAddress.addr} \
|
|
"$@"
|
|
'';
|
|
defaultText = "(See source)";
|
|
};
|
|
|
|
runAsUserCmd = mkOption {
|
|
readOnly = true;
|
|
default = if config.security.doas.enable
|
|
then "doas -u"
|
|
else "sudo -u";
|
|
defaultText = "(See source)";
|
|
};
|
|
};
|
|
};
|
|
}
|