From a942177ecf8fe7b28d4218e9fc80bd4c4a4e0341 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 1 Feb 2021 22:53:13 +0100
Subject: [PATCH] treewide: remove user descriptions

User descriptions are stored in the `comment` field in /etc/passwd.
In our case, these are completely redundant and don't add any useful information.
---
 modules/bitcoind.nix            | 5 +----
 modules/btcpayserver.nix        | 2 --
 modules/clightning.nix          | 1 -
 modules/electrs.nix             | 1 -
 modules/joinmarket.nix          | 1 -
 modules/liquid.nix              | 1 -
 modules/lnd.nix                 | 1 -
 modules/recurring-donations.nix | 1 -
 modules/spark-wallet.nix        | 1 -
 9 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 9752b88..22ff942 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -381,10 +381,7 @@ in {
       } // nbLib.allowTor;
     };
 
-    users.users.${cfg.user} = {
-      group = cfg.group;
-      description = "Bitcoin daemon user";
-    };
+    users.users.${cfg.user}.group = cfg.group;
     users.groups.${cfg.group} = {};
     users.groups.bitcoinrpc = {};
     nix-bitcoin.operator.groups = [ cfg.group ];
diff --git a/modules/btcpayserver.nix b/modules/btcpayserver.nix
index fe38313..a6c1338 100644
--- a/modules/btcpayserver.nix
+++ b/modules/btcpayserver.nix
@@ -203,14 +203,12 @@ in {
     };
 
     users.users.${cfg.nbxplorer.user} = {
-      description = "nbxplorer user";
       group = cfg.nbxplorer.group;
       extraGroups = [ "bitcoinrpc" ];
       home = cfg.nbxplorer.dataDir;
     };
     users.groups.${cfg.nbxplorer.group} = {};
     users.users.${cfg.btcpayserver.user} = {
-      description = "btcpayserver user";
       group = cfg.btcpayserver.group;
       extraGroups = [ "nbxplorer" ]
                     ++ optional (cfg.btcpayserver.lightningBackend == "clightning") cfg.clightning.user;
diff --git a/modules/clightning.nix b/modules/clightning.nix
index f2d64e4..2ed4ebc 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -107,7 +107,6 @@ in {
 
     environment.systemPackages = [ nbPkgs.clightning (hiPrio cfg.cli) ];
     users.users.${cfg.user} = {
-        description = "clightning User";
         group = cfg.group;
         extraGroups = [ "bitcoinrpc" ];
     };
diff --git a/modules/electrs.nix b/modules/electrs.nix
index a2c8102..891efc8 100644
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@@ -110,7 +110,6 @@ in {
     };
 
     users.users.${cfg.user} = {
-      description = "electrs User";
       group = cfg.group;
       extraGroups = [ "bitcoinrpc" ] ++ optionals cfg.high-memory [ "bitcoin" ];
     };
diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index f593d34..76aa0df 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -147,7 +147,6 @@ in {
       (hiPrio cfg.cli)
     ];
     users.users.${cfg.user} = {
-        description = "joinmarket User";
         group = cfg.group;
         home = cfg.dataDir;
         extraGroups = [ "tor" ];
diff --git a/modules/liquid.nix b/modules/liquid.nix
index 3d482bd..2c379a7 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -248,7 +248,6 @@ in {
     users.users.${cfg.user} = {
       group = cfg.group;
       extraGroups = [ "bitcoinrpc" ];
-      description = "Liquid sidechain user";
     };
     users.groups.${cfg.group} = {};
     nix-bitcoin.operator.groups = [ cfg.group ];
diff --git a/modules/lnd.nix b/modules/lnd.nix
index b6e2549..51376f1 100644
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@@ -271,7 +271,6 @@ in {
     };
 
     users.users.lnd = {
-      description = "LND User";
       group = "lnd";
       extraGroups = [ "bitcoinrpc" ];
       home = cfg.dataDir; # lnd creates .lnd dir in HOME
diff --git a/modules/recurring-donations.nix b/modules/recurring-donations.nix
index 84ebea9..74c6dc5 100644
--- a/modules/recurring-donations.nix
+++ b/modules/recurring-donations.nix
@@ -82,7 +82,6 @@ in {
     services.clightning.enable = true;
 
     users.users.recurring-donations = {
-        description = "recurring-donations User";
         group = "recurring-donations";
         extraGroups = [ "clightning" ];
     };
diff --git a/modules/spark-wallet.nix b/modules/spark-wallet.nix
index 3a46f89..0a4b469 100644
--- a/modules/spark-wallet.nix
+++ b/modules/spark-wallet.nix
@@ -61,7 +61,6 @@ in {
     services.clightning.enable = true;
 
     users.users.spark-wallet = {
-      description = "spark-wallet User";
       group = "spark-wallet";
       extraGroups = [ "clightning" ];
     };