From e0342ef5c0f65988dc88a5f0611520f8eb9aa7b9 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Mon, 26 Aug 2024 16:48:18 -0700
Subject: [PATCH] Nixpkgs update Nix-Bitcoin update Configuration.nix

---
 configuration.nix            | 24 +-----------------------
 flake.lock                   | 24 ++++++++++++------------
 modules/bitcoinecosystem.nix | 15 +++++++--------
 3 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 1524c04..d5da488 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -121,29 +121,6 @@ in
 	systemd.services."getty@tty1".enable = true;
 	systemd.services."autovt@tty1".enable = true;
 
-
-	# Fix the GNOME Desktop Environment Performance
-
-	nixpkgs.config.allowAliases = false;
-
-	nixpkgs.overlays = [
-	# GNOME 46: triple-buffering-v4-46
-		(final: prev: {
-			gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
-				mutter = gnomePrev.mutter.overrideAttrs (old: {
-					src = pkgs.fetchFromGitLab  {
-						domain = "gitlab.gnome.org";
-						owner = "vanvugt";
-						repo = "mutter";
-						rev = "triple-buffering-v4-46";
-						hash = "sha256-C2VfW3ThPEZ37YkX7ejlyumLnWa9oij333d5c4yfZxc=";
-					};
-				});
-			});
-		})
-	];
-
-
 	# Allow Flatpak
 	services.flatpak.enable = true;
 
@@ -323,6 +300,7 @@ in
 
 	services.mysql = {
 			enable = true;
+			package = pkgs.mariadb;
 			};
 
 	
diff --git a/flake.lock b/flake.lock
index 566bca1..324eb1e 100755
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         "nixpkgs-unstable": "nixpkgs-unstable"
       },
       "locked": {
-        "lastModified": 1723533469,
-        "narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=",
+        "lastModified": 1724684170,
+        "narHash": "sha256-4O04EoHn87zIpiogIRXSgkqRyOs7ygIAIO9dhjhpmGI=",
         "owner": "fort-nix",
         "repo": "nix-bitcoin",
-        "rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7",
+        "rev": "31b79391cf96b64c3982038c8284e04345429dbd",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723221148,
-        "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
+        "lastModified": 1724395761,
+        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
+        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1723282977,
-        "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
+        "lastModified": 1724316499,
+        "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
+        "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1724479785,
+        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
         "type": "github"
       },
       "original": {
diff --git a/modules/bitcoinecosystem.nix b/modules/bitcoinecosystem.nix
index 62939f2..587ea66 100755
--- a/modules/bitcoinecosystem.nix
+++ b/modules/bitcoinecosystem.nix
@@ -3,6 +3,7 @@
 {
 	
 	## Bitcoind
+	
 	services.bitcoind = {
 		enable = true;
 		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
@@ -24,6 +25,7 @@
 	
 
 	## Electrs
+	
 	services.electrs = {
 		enable = true;
 		tor.enforce = true;
@@ -33,6 +35,7 @@
 
 
 	## CLN
+	
 	services.clightning = {
 		enable = true;
 		tor.proxy = true;
@@ -55,6 +58,7 @@ experimental-offers
 	
 	
 	## LND
+	
 	services.lnd = {
 		enable = true;
 		tor.enforce = true;
@@ -82,6 +86,7 @@ experimental-offers
 	
 
 	## RTL
+	
 	services.rtl = {
 		enable = true;
 		tor.enforce = true;
@@ -107,15 +112,8 @@ experimental-offers
 		};
 	};
 
-	
-	## Mempool
-	services.mempool.enable = true;
-
-	nix-bitcoin.onionServices.mempool-frontend.enable = true;
-
-	
-
 	## Lndconnect
+
 	services.lnd.lndconnect = {
 		enable = true;
 		onion = true;
@@ -131,6 +129,7 @@ experimental-offers
 	
 
 	## BTCpay Server
+	
 	services.btcpayserver = {
 		enable = true;
 		};