Sovran Patch
362fa0b36c
Decouple the Bitcoin/Lightning modules and packages into the standalone
Sovran_Bitcoin flake, consumed as a NixOS module input.
Deleted (now in Sovran_Bitcoin):
- modules/bitcoin/ (19 files — vendored nix-bitcoin modules)
- modules/bitcoinecosystem.nix
- modules/nwc-wallets.nix
- modules/mempool.nix
- packages/{albyhub,mempool,rtl,build-support}/
- tests/bitcoin-btcpay-hardening.nix
Created:
- modules/sovran-bitcoin-integration.nix — the OS-specific bridge that
maps sovran_systemsOS.* options to sovran-bitcoin.* and applies
Second_Drive paths, operator 'free', forced wallet, firewall 3051,
and Sovran Hub NWC environment wiring.
Modified:
- flake.nix — added sovran-bitcoin flake input, updated module imports
- modules/modules.nix — removed deleted imports
- modules/core/sovran-hub.nix — version metadata now reads from
pkgs.sovran-bitcoin.* overlay instead of local packages/
- tests/test_bitcoin_tor_gossip.py — updated to check integration layer
The sovran_systemsOS.* option namespace is preserved. The Hub, roles,
and custom.nix continue to work unchanged.
63 lines
2.2 KiB
Nix
Executable File
63 lines
2.2 KiB
Nix
Executable File
{ config, lib, ... }:
|
|
|
|
{
|
|
config = lib.mkMerge [
|
|
|
|
# The Sovran_Bitcoin flake module is always imported (see flake.nix).
|
|
# This default satisfies the secrets assertion so Desktop-Only systems evaluate
|
|
# without enabling any Bitcoin services.
|
|
{
|
|
nix-bitcoin.generateSecrets = lib.mkDefault true;
|
|
}
|
|
|
|
# ── Server+Desktop Role (default) ─────────────────────────
|
|
(lib.mkIf config.sovran_systemsOS.roles.server_plus_desktop {
|
|
sovran_systemsOS.web.btcpayserver = lib.mkDefault true;
|
|
})
|
|
|
|
# ── Desktop Only Role ─────────────────────────────────────
|
|
(lib.mkIf config.sovran_systemsOS.roles.desktop {
|
|
services.desktopManager.gnome.enable = true;
|
|
|
|
# Force all server/node services and features off so they cannot be
|
|
# accidentally enabled via custom.nix or option defaults on Desktop Only.
|
|
sovran_systemsOS.services = {
|
|
synapse = lib.mkForce false;
|
|
bitcoin = lib.mkForce false;
|
|
vaultwarden = lib.mkForce false;
|
|
wordpress = lib.mkForce false;
|
|
nextcloud = lib.mkForce false;
|
|
};
|
|
|
|
sovran_systemsOS.features = {
|
|
haven = lib.mkForce false;
|
|
mempool = lib.mkForce false;
|
|
element-calling = lib.mkForce false;
|
|
bitcoin-tor-gossip = lib.mkForce false;
|
|
"nwc-wallets" = lib.mkForce false;
|
|
};
|
|
|
|
sovran_systemsOS.web.btcpayserver = lib.mkForce false;
|
|
})
|
|
|
|
# ── Bitcoin Node Only Role ────────────────────────────────
|
|
# Bitcoin ecosystem + mempool, BTCPay runs but not exposed via Caddy
|
|
(lib.mkIf config.sovran_systemsOS.roles.node {
|
|
sovran_systemsOS.services = {
|
|
bitcoin = lib.mkDefault true;
|
|
synapse = lib.mkDefault false;
|
|
vaultwarden = lib.mkDefault false;
|
|
wordpress = lib.mkDefault false;
|
|
nextcloud = lib.mkDefault false;
|
|
};
|
|
|
|
sovran_systemsOS.features = {
|
|
mempool = lib.mkDefault true;
|
|
};
|
|
|
|
sovran_systemsOS.web.btcpayserver = lib.mkDefault false;
|
|
})
|
|
|
|
];
|
|
}
|