From fe5376c9a740b476e458a2c043d033f2077e54c8 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Sun, 23 Mar 2025 19:36:55 -0500
Subject: [PATCH] updated BTCPayserver, nixpkgs, and systemd-extension

---
 flake.nix                                  | 15 ++-------------
 modules/bitcoinecosystem.nix               |  1 -
 modules/systemd-manager_sovran_systems.nix |  6 +++---
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index 20d4f24..76b5566 100755
--- a/flake.nix
+++ b/flake.nix
@@ -17,13 +17,9 @@
 
 		nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
 
-		btcpayserver-new.url = "github:Dreaming-Codes/nixpkgs/update-btcpayserver";
-
-		
-
 	};
 
-	outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, btcpayserver-new, ... }: 
+	outputs = { self, nixpkgs, nix-bitcoin, nixvim, agenix, bisq1, nixpkgs-stable, ... }: 
 
 	let 
 		system = "x86_64-linux";
@@ -38,13 +34,6 @@
 
 		};
 
-		overlay-btcpaynew = final: prev: {
-			
-			new-btcpaynew = import btcpayserver-new {
-				inherit system;
-				config.allowunfree = true;
-			};
-		};
 	in
 
 	{ 
@@ -60,7 +49,7 @@
 
 			imports = [
 
-				({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable overlay-btcpaynew ]; })
+				({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-stable ]; })
 
 				./configuration.nix
 
diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix
index 919c205..040f277 100755
--- a/modules/bitcoinecosystem.nix
+++ b/modules/bitcoinecosystem.nix
@@ -132,7 +132,6 @@ experimental-offers
 	
 	services.btcpayserver = {
 		enable = true;
-		package = pkgs.new-btcpaynew.btcpayserver;
 		};
 		
 	services.btcpayserver.lightningBackend = "lnd";
diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix
index 7f76f5d..5b376f3 100755
--- a/modules/systemd-manager_sovran_systems.nix
+++ b/modules/systemd-manager_sovran_systems.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 	pname = "systemd-manager";
-	version = "17";
+	version = "18";
 
 	src = fetchzip {
 		url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip";
-		hash = "sha256-NaOqhiVTACiGiUn8ISTtBMIDkeGkv1M2kCDnAxl5cwk=";
+		hash = "sha256-Kd8ZxZ1f6aR1vThrWStsjk8cHrjo2KCYQgpg1em/n2k=";
 		stripRoot = false;
 	};
 
@@ -38,4 +38,4 @@ stdenv.mkDerivation rec {
 		maintainers = with maintainers; [ ];
 		homepage = "https://github.com/hardpixel/systemd-manager";
 	};
-}
\ No newline at end of file
+}