From b1a5f5e7b9809f0bab83b0ebb82af62a6185986d Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 9 Nov 2020 22:09:08 +0100 Subject: [PATCH] don't add service-only pkgs to systemPackages These packages are not useful in shell environemnts. --- modules/electrs.nix | 2 -- modules/lightning-charge.nix | 1 - modules/nanopos.nix | 2 -- modules/spark-wallet.nix | 1 - 4 files changed, 6 deletions(-) diff --git a/modules/electrs.nix b/modules/electrs.nix index f1f5899..19e7459 100644 --- a/modules/electrs.nix +++ b/modules/electrs.nix @@ -63,8 +63,6 @@ in { services.bitcoind.enable = true; - environment.systemPackages = [ pkgs.nix-bitcoin.electrs ]; - systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -" ]; diff --git a/modules/lightning-charge.nix b/modules/lightning-charge.nix index bda008f..b002d6a 100644 --- a/modules/lightning-charge.nix +++ b/modules/lightning-charge.nix @@ -51,7 +51,6 @@ in { "d '${cfg.dataDir}' 0700 ${user} ${group} - -" ]; - environment.systemPackages = [ pkgs.nix-bitcoin.lightning-charge ]; systemd.services.lightning-charge = { description = "Run lightning-charge"; wantedBy = [ "multi-user.target" ]; diff --git a/modules/nanopos.nix b/modules/nanopos.nix index 30bbe3f..d3ed3d9 100644 --- a/modules/nanopos.nix +++ b/modules/nanopos.nix @@ -79,8 +79,6 @@ in { services.lightning-charge.enable = true; - environment.systemPackages = [ pkgs.nix-bitcoin.nanopos ]; - services.nginx = { enable = true; virtualHosts."_" = { diff --git a/modules/spark-wallet.nix b/modules/spark-wallet.nix index 5667a3e..7987c8a 100644 --- a/modules/spark-wallet.nix +++ b/modules/spark-wallet.nix @@ -54,7 +54,6 @@ in { config = mkIf cfg.enable { services.clightning.enable = true; - environment.systemPackages = [ pkgs.nix-bitcoin.spark-wallet ]; users.users.spark-wallet = { description = "spark-wallet User"; group = "spark-wallet";