From 2b9b3ba1c500e51c86c6cfb06fd49febe56e455d Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 27 Nov 2019 14:04:36 +0100
Subject: [PATCH] systemPackages: improve readability with shorter service
 references

---
 modules/nix-bitcoin.nix | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix
index 52785ec..cc050c3 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/nix-bitcoin.nix
@@ -155,32 +155,31 @@ in {
       }];
       version = 3;
     };
-    environment.systemPackages = with pkgs; with nix-bitcoin; [
+    environment.systemPackages = with pkgs; with nix-bitcoin; let
+      s = config.services;
+    in
+    [
       tor
       bitcoind
-      (hiPrio config.services.bitcoind.cli)
+      (hiPrio s.bitcoind.cli)
       nodeinfo
       jq
       qrencode
     ]
-    ++ optionals config.services.clightning.enable [clightning (hiPrio config.services.clightning.cli)]
-    ++ optionals config.services.lnd.enable [lnd (hiPrio config.services.lnd.cli)]
-    ++ optionals config.services.lightning-charge.enable [lightning-charge]
-    ++ optionals config.services.nanopos.enable [nanopos]
-    ++ optionals config.services.nix-bitcoin-webindex.enable [nginx]
-    ++ optionals config.services.liquidd.enable [
-         elementsd
-         (hiPrio config.services.liquidd.cli)
-         (hiPrio config.services.liquidd.swap-cli)
-       ]
-    ++ optionals config.services.spark-wallet.enable [spark-wallet]
-    ++ optionals config.services.electrs.enable [electrs]
-    ++ optionals (config.services.hardware-wallets.ledger || config.services.hardware-wallets.trezor) [
+    ++ optionals s.clightning.enable [clightning (hiPrio s.clightning.cli)]
+    ++ optionals s.lnd.enable [lnd (hiPrio s.lnd.cli)]
+    ++ optionals s.lightning-charge.enable [lightning-charge]
+    ++ optionals s.nanopos.enable [nanopos]
+    ++ optionals s.nix-bitcoin-webindex.enable [nginx]
+    ++ optionals s.liquidd.enable [elementsd (hiPrio s.liquidd.cli) (hiPrio s.liquidd.swap-cli)]
+    ++ optionals s.spark-wallet.enable [spark-wallet]
+    ++ optionals s.electrs.enable [electrs]
+    ++ optionals (s.hardware-wallets.ledger || s.hardware-wallets.trezor) [
         hwi
-        # To allow debugging issues with lsusb:
+        # To allow debugging issues with lsusb
         usbutils
     ]
-    ++ optionals config.services.hardware-wallets.trezor [
+    ++ optionals s.hardware-wallets.trezor [
         python3.pkgs.trezor
     ];
   };