From 1e4a988ca2d4f896ba2001d947749e67fa6ddc3d Mon Sep 17 00:00:00 2001 From: naturallaw777 <99053422+naturallaw777@users.noreply.github.com> Date: Wed, 29 Jul 2026 02:58:33 +0000 Subject: [PATCH] fix(nwc-wallets): replace incorrect lib.mkIf usage with plain if expressions Co-authored-by: arena-agent <297053741+arena-agent@users.noreply.github.com> --- modules/nwc-wallets.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/nwc-wallets.nix b/modules/nwc-wallets.nix index b36d8ae..a329183 100644 --- a/modules/nwc-wallets.nix +++ b/modules/nwc-wallets.nix @@ -19,9 +19,10 @@ let NWC_LND_ADDRESS = "${lndRpcAddress}:${lndRpcPort}"; NWC_LND_CERT_FILE = lndCertPath; NWC_LND_MACAROON_FILE = "/run/lnd/albyhub.macaroon"; - NWC_RELAY = lib.mkIf config.sovran_systemsOS.features.haven - "wss://haven.${config.networking.domain}/nostr" - "wss://relay.getalby.com,wss://relay2.getalby.com"; + NWC_RELAY = + if config.sovran_systemsOS.features.haven + then "wss://haven.${config.networking.domain}/nostr" + else "wss://relay.getalby.com,wss://relay2.getalby.com"; }; wrappedNwcWallet = lib.hiPrio (pkgs.writeShellScriptBin "nwc-wallet" '' export NWC_ALBY_HUB_API_BASE='${pythonManagerEnvironment.NWC_ALBY_HUB_API_BASE}' @@ -113,9 +114,10 @@ lib.mkIf config.sovran_systemsOS.features."nwc-wallets" { DATABASE_URI = "/var/lib/albyhub/nwc.db"; PORT = toString albyHubPort; # Use private Nostr relay if Haven is enabled, otherwise default to Alby's public relays - RELAY = lib.mkIf config.sovran_systemsOS.features.haven - "wss://haven.${config.networking.domain}/nostr" - "wss://relay.getalby.com,wss://relay2.getalby.com"; + RELAY = + if config.sovran_systemsOS.features.haven + then "wss://haven.${config.networking.domain}/nostr" + else "wss://relay.getalby.com,wss://relay2.getalby.com"; AUTO_LINK_ALBY_ACCOUNT = "false"; SEND_EVENTS_TO_ALBY = "false"; LOG_TO_FILE = "false";