From 314272a228f974dc41c36ba2a9f3997d35ff7361 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 12 Jan 2020 20:52:37 +0100 Subject: [PATCH] lnd, nanopos: move user and group definitions to the bottom This is the default service formatting style in nixpkgs. --- modules/lnd.nix | 15 +++++++-------- modules/nanopos.nix | 11 +++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/modules/lnd.nix b/modules/lnd.nix index f879cc2..a26e189 100644 --- a/modules/lnd.nix +++ b/modules/lnd.nix @@ -70,14 +70,6 @@ in { }; config = mkIf cfg.enable { - users.users.lnd = { - description = "LND User"; - group = "lnd"; - extraGroups = [ "bitcoinrpc" ]; - home = cfg.dataDir; - }; - users.groups.lnd = {}; - systemd.services.lnd = { description = "Run LND"; path = [ pkgs.nix-bitcoin.bitcoind ]; @@ -152,5 +144,12 @@ in { done ''; }; + users.users.lnd = { + description = "LND User"; + group = "lnd"; + extraGroups = [ "bitcoinrpc" ]; + home = cfg.dataDir; + }; + users.groups.lnd = {}; }; } diff --git a/modules/nanopos.nix b/modules/nanopos.nix index cbfdc0c..1510198 100644 --- a/modules/nanopos.nix +++ b/modules/nanopos.nix @@ -52,12 +52,6 @@ in { }; config = mkIf cfg.enable { - users.users.nanopos = { - description = "nanopos User"; - group = "nanopos"; - }; - users.groups.nanopos = {}; - systemd.services.nanopos = { description = "Run nanopos"; wantedBy = [ "multi-user.target" ]; @@ -74,5 +68,10 @@ in { // nix-bitcoin-services.nodejs // nix-bitcoin-services.allowTor; }; + users.users.nanopos = { + description = "nanopos User"; + group = "nanopos"; + }; + users.groups.nanopos = {}; }; }