modules: move user/group options to bottom

These are insignificant, generic options; place them above readonly options.
We already do this in other services.

Also move user/group config to bottom in spark-wallet.
This commit is contained in:
Erik Arvstedt
2021-09-13 13:41:47 +02:00
parent 27c45b82cc
commit ad97c268c6
6 changed files with 54 additions and 55 deletions
+7 -7
View File
@@ -65,13 +65,6 @@ in {
config = mkIf cfg.enable {
services.clightning.enable = true;
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
extraGroups = [ config.services.clightning.group ];
};
users.groups.${cfg.group} = {};
systemd.services.spark-wallet = {
wantedBy = [ "multi-user.target" ];
requires = [ "clightning.service" ];
@@ -85,6 +78,13 @@ in {
// nbLib.nodejs;
};
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
extraGroups = [ config.services.clightning.group ];
};
users.groups.${cfg.group} = {};
nix-bitcoin.secrets.spark-wallet-login.user = cfg.user;
nix-bitcoin.generateSecretsCmds.spark-wallet = ''
makePasswordSecret spark-wallet-password