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

Systemd's `Description` option is a misnomer (as confessed by `man systemd.unit`):
Its value is used by user-facing tools in place of the unit file name, so this option
could have been more aptly named `label` or `name`.
`Description` should only be set if the unit file name is not sufficient for naming a unit.
This is not the case for our services, except for `systemd.services.nb-netns-bridge`
whose description has been kept.

As an example how this affects users, weird journal lines like
```
nb-test systemd[1]: Starting Run clightningd...
```
are now replaced by
```
nb-test systemd[1]: Starting clightning.service...
```
---
 modules/bitcoind.nix            | 1 -
 modules/btcpayserver.nix        | 1 -
 modules/clightning.nix          | 1 -
 modules/electrs.nix             | 1 -
 modules/joinmarket.nix          | 2 --
 modules/liquid.nix              | 1 -
 modules/lnd.nix                 | 1 -
 modules/recurring-donations.nix | 1 -
 modules/spark-wallet.nix        | 1 -
 9 files changed, 10 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 22ff942..ddf47a7 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -312,7 +312,6 @@ in {
     ];
 
     systemd.services.bitcoind = {
-      description = "Bitcoin daemon";
       requires = [ "nix-bitcoin-secrets.target" ];
       after = [ "network.target" "nix-bitcoin-secrets.target" ];
       wantedBy = [ "multi-user.target" ];
diff --git a/modules/btcpayserver.nix b/modules/btcpayserver.nix
index a6c1338..82628b7 100644
--- a/modules/btcpayserver.nix
+++ b/modules/btcpayserver.nix
@@ -123,7 +123,6 @@ in {
         port=${toString cfg.nbxplorer.port}
       '';
     in {
-      description = "Run nbxplorer";
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
diff --git a/modules/clightning.nix b/modules/clightning.nix
index 2ed4ebc..9c6f04d 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -118,7 +118,6 @@ in {
     ];
 
     systemd.services.clightning = {
-      description = "Run clightningd";
       path  = [ nbPkgs.bitcoind ];
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
diff --git a/modules/electrs.nix b/modules/electrs.nix
index 891efc8..f11dc76 100644
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@@ -68,7 +68,6 @@ in {
     ];
 
     systemd.services.electrs = {
-      description = "Electrs Electrum Server";
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 76aa0df..dc8d646 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -171,7 +171,6 @@ in {
     };
 
     systemd.services.joinmarket = {
-      description = "JoinMarket Daemon";
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
@@ -226,7 +225,6 @@ in {
           chmod +x $out
         '';
     in {
-      description = "CoinJoin maker bot to gain privacy and passively generate income";
       wantedBy = [ "joinmarket.service" ];
       requires = [ "joinmarket.service" ];
       after = [ "joinmarket.service" ];
diff --git a/modules/liquid.nix b/modules/liquid.nix
index 2c379a7..7faf57d 100644
--- a/modules/liquid.nix
+++ b/modules/liquid.nix
@@ -220,7 +220,6 @@ in {
     ];
 
     systemd.services.liquidd = {
-      description = "Elements daemon providing access to the Liquid sidechain";
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
       wantedBy = [ "multi-user.target" ];
diff --git a/modules/lnd.nix b/modules/lnd.nix
index 51376f1..72f21f9 100644
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@@ -173,7 +173,6 @@ in {
     };
 
     systemd.services.lnd = {
-      description = "Run LND";
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
diff --git a/modules/recurring-donations.nix b/modules/recurring-donations.nix
index 74c6dc5..0feb2a1 100644
--- a/modules/recurring-donations.nix
+++ b/modules/recurring-donations.nix
@@ -88,7 +88,6 @@ in {
     users.groups.recurring-donations = {};
 
     systemd.services.recurring-donations = {
-      description = "Run recurring-donations";
       requires = [ "clightning.service" ];
       after = [ "clightning.service" ];
       path = with pkgs; [ nix-bitcoin.clightning curl sudo jq ];
diff --git a/modules/spark-wallet.nix b/modules/spark-wallet.nix
index 0a4b469..48db046 100644
--- a/modules/spark-wallet.nix
+++ b/modules/spark-wallet.nix
@@ -67,7 +67,6 @@ in {
     users.groups.spark-wallet = {};
 
     systemd.services.spark-wallet = {
-      description = "Run spark-wallet";
       wantedBy = [ "multi-user.target" ];
       requires = [ "clightning.service" ];
       after = [ "clightning.service" ];