removed CLN and general code updates

configuration.nix

@@ -92,15 +92,15 @@ in
 	# Allow Flatpak
 	services.flatpak.enable = true;
 
-  systemd.services.flatpak-repo = {
+        systemd.services.flatpak-repo = {
-    wantedBy = [ "multi-user.target" ];
+    		wantedBy = [ "multi-user.target" ];
-    after = [ "network-online.target" ];
+    		after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
+    		wants = [ "network-online.target" ];
-    path = [ pkgs.flatpak ];
+    		path = [ pkgs.flatpak ];
-    script = ''
+    			script = ''
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+      				flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    '';
+    			'';
-  };
+  	};
 
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
@@ -110,17 +110,16 @@ in
 		"jitsi-meet-1.0.8043"
 	];
 	
-	# List packages installed in system profile. To search, run:
+	# List packages installed
-	# $ nix search wget
 	environment.systemPackages = with pkgs; [
 		git
 		wget
 		fish
 		htop
 		btop
-    gnomeExtensions.transparent-top-bar-adjustable-transparency
+    		gnomeExtensions.transparent-top-bar-adjustable-transparency
 		gnomeExtensions.systemd-manager
-    gnomeExtensions.dash-to-dock
+    		gnomeExtensions.dash-to-dock
 		gnomeExtensions.vitals
 		gnomeExtensions.pop-shell
 		gnomeExtensions.just-perfection
@@ -156,7 +155,7 @@ in
 		firefox
 		element-desktop
 		wp-cli
-    axel
+    		axel
 
 	];
 
@@ -175,7 +174,7 @@ in
 	};
 
 
-####### CADDY  #######
+	####### CADDY  #######
 	services.caddy = {
 		enable = true;
 		user = "caddy";
@@ -244,7 +243,7 @@ in
 		};
 	};
 
-###### AGENIX ######
+	###### AGENIX ######
 	age.identityPaths = [ "/root/.ssh/agenix/agenix-secret-keys" ];
 
 	age.secrets.matrix_reg_secret = {
@@ -257,7 +256,7 @@ in
 
 
 
-###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) #######
+	###### CREATE DATABASE (WORDPRESS, MATRIX_SYNAPSE, AND NEXTCLOUD) #######
 	services.postgresql = {
 		enable = true;
 	};
@@ -304,7 +303,7 @@ in
 	;
 
 
-####### KEEP AWAKE for DISPLAY and HEADLESS #######
+	####### KEEP AWAKE for DISPLAY and HEADLESS #######
 	services.displayManager.gdm.autoSuspend = false;
 
 	systemd.sleep.extraConfig = ''
@@ -315,7 +314,7 @@ in
 	'';
 
 
-####### BACKUP TO INTERNAL DRIVE #######
+	####### BACKUP TO INTERNAL DRIVE #######
 	services.rsnapshot = {
 		enable = true;
 		extraConfig = ''
@@ -334,7 +333,7 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	};
 
 
-####### CRON #######
+	####### CRON #######
 	services.cron = {
 		enable = true;
 		systemCronJobs = [
@@ -348,7 +347,7 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	};
 
 
-####### TOR #######
+	####### TOR #######
 	services.tor = {
 		enable = true;
 		client.enable = true;
@@ -358,7 +357,7 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	services.privoxy.enableTor = true;
 
 
-####### Enable the OpenSSH daemon #######
+	####### Enable the SSH #######
 	services.openssh = {
 		enable = true;
 		settings = {
@@ -369,7 +368,7 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	};
 
 
-#######FailtoBan#######
+	#######FailtoBan#######
 	services.fail2ban = {
 		enable = true;
 		ignoreIP = [
@@ -382,7 +381,7 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	};
 	
 
-####### Open ports in the firewall #######
+	####### Open ports in the firewall #######
 	networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ];
 	networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ];
 	
@@ -393,7 +392,7 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 	networking.firewall.enable = true;
 
 	
-####### AUTO COLLECT GARABAGE #######
+	####### AUTO COLLECT GARABAGE #######
 	nix.gc = {
 		automatic = true;
 		dates = "weekly";

modules/bitcoinecosystem.nix

@@ -6,7 +6,7 @@
 	
 	services.bitcoind = {
 		enable = true;
-    package = config.nix-bitcoin.pkgs.bitcoind-knots;
+    		package = config.nix-bitcoin.pkgs.bitcoind-knots;
 		dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
 		txindex = true;
 		tor.proxy = true;
@@ -32,52 +32,25 @@
 		};
 
 
-
+  	## LND
-	## CLN
-	
-	services.clightning = {
-		enable = true;
-		tor.proxy = true;
-		tor.enforce = true;
-		port = 9737;
-	};
-	
-	nix-bitcoin.onionServices.clightning.public = true;
-
-
-	services.clightning.replication = {
-		enable = true;
-		local.directory = "/run/media/Second_Drive/BTCEcoandBackup/clightning_db_backup";
-		encrypt = false;
-	};
-
-	
-	
-	## LND
 	
 	services.lnd = {
 		enable = true;
 		tor.enforce = true;
 		tor.proxy = true;
 		extraConfig = ''
-
 			protocol.option-scid-alias=true
-
 		'';
 	};
 
 	nix-bitcoin.onionServices.lnd.public = true;
 
-	services.lightning-loop = {
-		enable = true;
-		tor.enforce = true;
-		tor.proxy = true;
-	};
 
-	services.lightning-pool = {
+  	## LNDconnect
+
+	services.lnd.lndconnect = {
 		enable = true;
-		tor.enforce = true;
+		onion = true;
-		tor.proxy = true;
 	};	
 
 		
@@ -89,42 +62,15 @@
 		port = 3050;
 		nightTheme = true;
 		nodes = {
-			clightning = {
-				enable = true;
-				extraConfig = {
-					Settings = {
-						enableOffers = true;
-					};
-				};
-			};
-		
 			lnd = {
 				enable = true;
-				loop = true;
 			};
 		
-		reverseOrder = true;
-		
 		};
 	};
 
-	## Lndconnect
 
-	services.lnd.lndconnect = {
+	## BTCpayserver
-		enable = true;
-		onion = true;
-	};
-
-	services.clightning.plugins.clnrest = {
-		enable = true;
-			lnconnect = {
-				enable = true;
-				onion = true;
-			};
-	};
-	
-
-	## BTCpay Server
 	
 	services.btcpayserver = {
 		enable = true;

modules/modules.nix

@@ -10,7 +10,6 @@
 		./bitcoinecosystem.nix
 		./vaultwarden.nix
 		./Sovran_SystemsOS_File_Fixes_And_New_Services.nix
-		./btcpayserver-fix.nix
 
 		];
 }