From 157af12aed89d34639b87934127b7fc60b099a6a Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Tue, 24 Mar 2026 22:25:48 -0500
Subject: [PATCH] updated flake

---
 flake.nix          | 10 ++++++----
 modules/bip110.nix | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5f5cbcd..6ad8001 100755
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
 
 	};
 
-	outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }@attrs: 
+	outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, btc-clients, nixpkgs-stable, bip110, ... }:
 
 	let 
 		
@@ -44,8 +44,6 @@
 	  nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
 			
 		  inherit system;
-
-      specialArgs = attrs;
   
     };
 		
@@ -64,12 +62,16 @@
         nixvim.nixosModules.nixvim
 
       ];
+
+      config = {
+        sovran_systemsOS.bip110.package =
+          bip110.packages.${pkgs.system}.bitcoind-knots-bip-110;
+      };
       
       environment.systemPackages = with pkgs; [
         btc-clients.packages.x86_64-linux.bisq
         btc-clients.packages.x86_64-linux.bisq2
         btc-clients.packages.x86_64-linux.sparrow
-        bip110.packages.x86_64-linux.bitcoind-knots-bip-110
       ];
     };
 	};
diff --git a/modules/bip110.nix b/modules/bip110.nix
index f3d64fb..a6cd617 100755
--- a/modules/bip110.nix
+++ b/modules/bip110.nix
@@ -1,7 +1,20 @@
-{ config, lib, pkgs, bip110, ... }:
+{ config, lib, pkgs, ... }:
 
-lib.mkIf config.sovran_systemsOS.features.bip110 {
+let
+  cfg = config.sovran_systemsOS;
+in
+{
+  options.sovran_systemsOS = {
+    features.bip110 = lib.mkEnableOption "Enable BIP110 bitcoind";
 
-  services.bitcoind.package = bip110.packages.x86_64-linux.bitcoind-knots-bip-110;
+    bip110.package = lib.mkOption {
+      type = lib.types.nullOr lib.types.package;
+      default = null;
+      description = "Custom bitcoind package for BIP110";
+    };
+  };
 
+  config = lib.mkIf (cfg.features.bip110 && cfg.bip110.package != null) {
+    services.bitcoind.package = cfg.bip110.package;
+  };
 }