From b85aac9ba1b7e6c16492d14e8d9bb83e8dfb043e Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sat, 19 Aug 2023 12:23:30 +0200
Subject: [PATCH 1/2] clightning: don't cleanup socket on startup

This is now taken care of by clightning itself.
---
 modules/clightning.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/clightning.nix b/modules/clightning.nix
index bc0a4d8..ad5c393 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -170,8 +170,6 @@ in {
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
       preStart = ''
-        # The RPC socket has to be removed otherwise we might have stale sockets
-        rm -f ${cfg.networkDir}/lightning-rpc
         umask u=rw,g=r,o=
         {
           cat ${configFile}

From e253b898585e406c18bde7a5d6ec9cc6985351d5 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 20 Aug 2023 10:51:54 +0200
Subject: [PATCH 2/2] clightning: depend on actual bitcoind package

---
 modules/clightning.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clightning.nix b/modules/clightning.nix
index ad5c393..e99dee3 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -165,7 +165,7 @@ in {
     ];
 
     systemd.services.clightning = {
-      path  = [ nbPkgs.bitcoind ];
+      path  = [ bitcoind.package ];
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];