cont

src/system/modules/bitcoin/default.nix

@@ -38,7 +38,29 @@ in
         testnet = false;
         user = "bitcoind";
         group = "bitcoin";
-        #extraConfig = TODO;
+        configFile = /var/lib/bitcoind/bitcoin.conf;
+
+        rpc = {
+          "btcd" = {
+            #passwordHMAC = #CHECK IF THIS IS SAFE TO EXPOSE!!;
+          };
+          port = 8332;
+        };
+
+        extraConfig = ''
+          server=1
+          mempoolfullrbf=1
+          v2transport=1
+
+          rpcbind=127.0.0.1
+          rpcallowip=127.0.0.1
+
+          proxy=127.0.0.1:9050
+          listen=1
+          listenonion=1
+          torcontrol=127.0.0.1:9051
+          torenablecircuit=1
+        '';
       };
     };
   };

src/system/modules/bitcoin/modules/core-lightning/default.nix

@@ -47,7 +47,7 @@ in
 
         PrivateTmp = true;
         ProtectSystem = "full";
-        NoNetPrivileges = true;
+        NoNewPrivileges = true;
         PrivateDevies = true;
       };
       Install = {

src/system/modules/bitcoin/modules/core-lightning/modules/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./c-lightning-REST
+  ];
+}

src/system/modules/bitcoin/modules/electrs/default.nix

@@ -21,14 +21,25 @@ in
 
     systemd.services.electrs = {
       Unit = {
-        after = [ "network.target" "bitcoind.service" ];
+        Description = "Electrs Bitcoin Indexer";
-        wantedBy = [ "multi-user.target" ];
+        After = [ "network.target" "bitcoind.service" ];
+        Requires = [ "bitcoind.service" ];
       };
       Service = {
-        ExecStart = "${pkgs.electrs}/bin/electrs --conf=...";
+        ExecStartPre = "/usr/bin/sleep 10";
-        Restart = "always";
+        ExecStart = "${pkgs.electrs}/bin/electrs";
+
         User = "electrs";
         Group = "bitcoin";
+        Type = "simple";
+
+        KillMode = "process";
+        TimeoutSec = "60";
+        Restart = "always";
+        RestartSec = "60";
+      };
+      Install = {
+        WantedBy = [ "multi-user.target" ];
       };
     };
   };

src/system/modules/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
     ./bitcoin
-    ./security
   ];
 }