From 0e00c39d4784bc64e30b1fc37c684e75e08bdaa6 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 14 Jan 2021 13:24:29 +0100
Subject: [PATCH] secure-node: improve layout

---
 modules/presets/secure-node.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/presets/secure-node.nix b/modules/presets/secure-node.nix
index e8ab5af..0b1e4b6 100644
--- a/modules/presets/secure-node.nix
+++ b/modules/presets/secure-node.nix
@@ -25,10 +25,14 @@ in {
 
     nix-bitcoin.security.hideProcessInformation = true;
 
+    environment.systemPackages = with pkgs; [
+      jq
+    ];
+
+    # sshd
     services.tor.hiddenServices.sshd = mkHiddenService { port = 22; };
     nix-bitcoin.onionAddresses.access.${operatorName} = [ "sshd" ];
 
-    # bitcoind
     services.bitcoind = {
       enable = true;
       listen = true;
@@ -43,7 +47,6 @@ in {
       rpc.threads = 16;
     };
 
-    # liquidd
     services.liquidd = {
       rpcuser = "liquidrpc";
       prune = 1000;
@@ -51,13 +54,11 @@ in {
       listen = true;
     };
 
-    # Backups
+    nix-bitcoin.nodeinfo.enable = true;
+
     services.backups.frequency = "daily";
 
-    environment.systemPackages = with pkgs; [
-      jq
-    ];
-
+    # operator
     nix-bitcoin.operator.enable = true;
     users.users.${operatorName} = {
       openssh.authorizedKeys.keys = config.users.users.root.openssh.authorizedKeys.keys;
@@ -69,7 +70,5 @@ in {
           cp "${config.users.users.root.home}/.vbox-nixops-client-key" "${config.users.users.${operatorName}.home}"
         '';
       };
-
-    nix-bitcoin.nodeinfo.enable = true;
   };
 }