Fixed bitcoin server & modules

src/system/modules/bitcoin/config/bitcoin.conf

@@ -1,4 +1,3 @@
-''
 server=1
 
 mempoolfullrbf=1
@@ -18,4 +17,3 @@ listen=1
 listenonion=1
 torcontrol=127.0.0.1:9051
 torenablecircuit=1
-''

src/system/modules/bitcoin/default.nix

@@ -5,11 +5,14 @@ let
   cfg = config.modules.system.bitcoin;
 
   home = "/var/lib/bitcoind";
-  conf = pkgs.writeText "bitcoin.conf" (import ./config);
 
+  bitcoinConf = pkgs.writeTextFile {
+    name = "bitcoin.conf";
+    text = builtins.readFile ./config/bitcoin.conf;
+  };
 
 in
-{ options.modules.system.bitcoin = { enable = mkEnableOption "system.bitcoin"; };
+{ options.modules.system.bitcoin = { enable = mkEnableOption "Bitcoin Server"; };
   imports = [ ./modules ];
   config = mkIf cfg.enable {
     nixpkgs.overlays = [
@@ -38,7 +41,6 @@ in
         "bitcoin" = {
           members = [
             "btc"
-            "electrs"
           ];
         };
       };
@@ -55,7 +57,7 @@ in
         enable = true;
         user = "btc";
         group = "bitcoin";
-        configFile = conf;
+        configFile = bitcoinConf;
         dataDir = home;
         pidFile = "${home}/bitcoind.pid";
       };

src/system/modules/bitcoin/modules/electrum/config/config.toml

@@ -0,0 +1,14 @@
+network = "bitcoin"
+
+electrum_rpc_addr = "127.0.0.1:50001"
+
+cookie-file = "/var/lib/bitcoind/.cookie"
+
+db_dir = "/var/lib/electrs"
+
+log_filters = "INFO"
+timestamp = true
+
+daemon-rpc-addr = "127.0.0.1:8332"
+daemon-p2p-addr = "127.0.0.1:8333"
+daemon-dir = "/var/lib/bitcoind"

src/system/modules/bitcoin/modules/electrum/config/default.nix

@@ -1,20 +0,0 @@
-let
-  daemonDir = "/var/lib/bitcoin";
-
-in
-''
-  network = "bitcoin"
-
-  electrum_rpc_addr = "127.0.0.1:50001"
-
-  cookie-file = "${daemonDir}/.cookie"
-
-  db_dir = "/var/lib/electrs"
-
-  log_filters = "INFO"
-  timestamp = true
-
-  daemon-rpc-addr = "127.0.0.1:8332"
-  daemon-p2p-addr = "127.0.0.1:8333"
-  daemon-dir = "${daemonDir}"
-''

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

@@ -7,24 +7,27 @@ let
 
   btc = config.modules.system.bitcoin;
 
-  conf = pkgs.writeText "config.toml" (import ./config);
+  electrsConfig = pkgs.writeTextFile {
+    name = "config.toml";
+    text = builtins.readFile ./config/config.toml;
+  };
 
 in
-{ options.modules.system.bitcoin.electrum = { enable = mkEnableOption "system.bitcoin.electrum"; };
+{ options.modules.system.bitcoin.electrum = { enable = mkEnableOption "Electrs Server"; };
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && btc.enable) {
-    #nixpkgs.overlays = [
+    nixpkgs.overlays = [
-    #  (final: prev: {
+      (final: prev: {
-    #    electrs = prev.electrs.overrideAttrs (old: rec {
+        electrs = prev.electrs.overrideAttrs (old: rec {
-    #      version = "0.10.4";
+          version = "0.10.4";
-    #      src = fetchFromGithub {
+          src = pkgs.fetchFromGitHub {
-    #        rev = "${version}";
+            owner = "romanz";
-    #        hash = ''
+            repo = "electrs";
-    #          sha256-0xw2532nmaxx9bjdpnnby03b83wc9zs8bv1wdfgv9q1phccqbkz1
+            rev = "${version}";
-    #        '';
+            hash = "sha256-4c+FGYM34LSfazzshfRPjA+0BvDL2tvkSr2rasUognc=";
-    #      };
+          };
-    #    });
+        });
-    #  })
+      })
-    #];
+    ];
 
     environment.systemPackages = with pkgs; [
       electrs
@@ -34,12 +37,19 @@ in
       users = {
         "electrs" = {
           inherit home;
-          description = "electrs system user";
+          description = "Electrs system user";
           isSystemUser = true;
           group = "bitcoin";
           createHome = true;
         };
       };
+      groups = {
+        "bitcoin" = {
+          members = mkAfter [
+            "electrs"
+          ];
+        };
+      };
     };
 
 
@@ -47,7 +57,7 @@ in
       description = "Electrs Bitcoin Indexer";
 
       script = "${pkgs.electrs}/bin/electrs";
-      scriptArgs = "--conf=${conf}";
+      scriptArgs = "--conf=${electrsConfig}";
 
       after = [
         "bitcoind-btc.service"