From b1da358bfb9b96add6f0b68df369a209ce04f766 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Thu, 30 Nov 2023 11:01:54 -0800 Subject: [PATCH] lib.mdDoc is a noop now --- modules/blocks/backup.nix | 12 ++++++------ modules/blocks/nginx.nix | 2 +- modules/blocks/postgresql.nix | 2 +- modules/blocks/ssl.nix | 2 +- modules/blocks/tinyproxy.nix | 14 +++++++------- modules/blocks/vpn.nix | 14 +++++++------- modules/services/deluge.nix | 4 ++-- modules/services/jellyfin.nix | 2 +- modules/services/nextcloud-server.nix | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/blocks/backup.nix b/modules/blocks/backup.nix index 8701feb..42ad08e 100644 --- a/modules/blocks/backup.nix +++ b/modules/blocks/backup.nix @@ -36,7 +36,7 @@ let }; repositories = lib.mkOption { - description = lib.mdDoc "Repositories to back this instance to."; + description = "Repositories to back this instance to."; type = lib.types.nonEmptyListOf lib.types.str; }; @@ -96,26 +96,26 @@ in { options.shb.backup = { onlyOnAC = lib.mkOption { - description = lib.mdDoc "Run backups only if AC power is plugged in."; + description = "Run backups only if AC power is plugged in."; default = true; example = false; type = lib.types.bool; }; user = lib.mkOption { - description = lib.mdDoc "Unix user doing the backups."; + description = "Unix user doing the backups."; type = lib.types.str; default = "backup"; }; group = lib.mkOption { - description = lib.mdDoc "Unix group doing the backups."; + description = "Unix group doing the backups."; type = lib.types.str; default = "backup"; }; instances = lib.mkOption { - description = lib.mdDoc "Each instance is a backup setting"; + description = "Each instance is a backup setting"; default = {}; type = lib.types.attrsOf (lib.types.submodule { options = instanceOptions; @@ -123,7 +123,7 @@ in }; borgServer = lib.mkOption { - description = lib.mdDoc "Add borgbackup package so external backups can use this server as a remote."; + description = "Add borgbackup package so external backups can use this server as a remote."; default = false; example = true; type = lib.types.bool; diff --git a/modules/blocks/nginx.nix b/modules/blocks/nginx.nix index 16f6f46..99670a2 100644 --- a/modules/blocks/nginx.nix +++ b/modules/blocks/nginx.nix @@ -59,7 +59,7 @@ in }; autheliaProtect = lib.mkOption { - description = lib.mdDoc "Endpoints to be protected by authelia."; + description = "Endpoints to be protected by authelia."; type = lib.types.listOf autheliaConfig; default = []; }; diff --git a/modules/blocks/postgresql.nix b/modules/blocks/postgresql.nix index 55039e3..5ddd813 100644 --- a/modules/blocks/postgresql.nix +++ b/modules/blocks/postgresql.nix @@ -6,7 +6,7 @@ in options.shb.postgresql = { debug = lib.mkOption { type = lib.types.bool; - description = lib.mdDoc '' + description = '' Enable debugging options. Currently enables shared_preload_libraries = "auto_explain, pg_stat_statements" diff --git a/modules/blocks/ssl.nix b/modules/blocks/ssl.nix index 69f3adf..4514bc5 100644 --- a/modules/blocks/ssl.nix +++ b/modules/blocks/ssl.nix @@ -38,7 +38,7 @@ in additionalCfg = lib.mkOption { type = lib.types.attrsOf lib.types.str; - description = lib.mdDoc ''Additional environment variables used to configure the DNS provider. + description = ''Additional environment variables used to configure the DNS provider. For secrets, use shb.ssl.credentialsFile instead. diff --git a/modules/blocks/tinyproxy.nix b/modules/blocks/tinyproxy.nix index a09e41e..b099bf6 100644 --- a/modules/blocks/tinyproxy.nix +++ b/modules/blocks/tinyproxy.nix @@ -33,19 +33,19 @@ in let instanceOption = types.submodule { options = { - enable = mkEnableOption (lib.mdDoc "Tinyproxy daemon"); + enable = mkEnableOption "Tinyproxy daemon"; package = mkPackageOptionMD pkgs "tinyproxy" {}; dynamicBindFile = mkOption { - description = lib.mdDoc '' + description = '' File holding the IP to bind to. ''; default = ""; }; settings = mkOption { - description = lib.mdDoc '' + description = '' Configuration for [tinyproxy](https://tinyproxy.github.io/). ''; default = { }; @@ -63,21 +63,21 @@ in Listen = mkOption { type = types.str; default = "127.0.0.1"; - description = lib.mdDoc '' + description = '' Specify which address to listen to. ''; }; Port = mkOption { type = types.int; default = 8888; - description = lib.mdDoc '' + description = '' Specify which port to listen to. ''; }; Anonymous = mkOption { type = types.listOf types.str; default = []; - description = lib.mdDoc '' + description = '' If an `Anonymous` keyword is present, then anonymous proxying is enabled. The headers listed with `Anonymous` are allowed through, while all others are denied. If no Anonymous keyword is present, then all headers are allowed through. You must @@ -87,7 +87,7 @@ in Filter = mkOption { type = types.nullOr types.path; default = null; - description = lib.mdDoc '' + description = '' Tinyproxy supports filtering of web sites based on URLs or domains. This option specifies the location of the file containing the filter rules, one rule per line. ''; diff --git a/modules/blocks/vpn.nix b/modules/blocks/vpn.nix index 96c91ce..c0641a0 100644 --- a/modules/blocks/vpn.nix +++ b/modules/blocks/vpn.nix @@ -205,40 +205,40 @@ in let instanceOption = lib.types.submodule { options = { - enable = lib.mkEnableOption (lib.mdDoc "OpenVPN config"); + enable = lib.mkEnableOption "OpenVPN config"; package = lib.mkPackageOptionMD pkgs "openvpn" {}; provider = lib.mkOption { - description = lib.mdDoc "VPN provider, if given uses ready-made configuration."; + description = "VPN provider, if given uses ready-made configuration."; type = lib.types.nullOr (lib.types.enum [ "nordvpn" ]); default = null; }; dev = lib.mkOption { - description = lib.mdDoc "Name of the interface."; + description = "Name of the interface."; type = lib.types.str; example = "tun0"; }; routingNumber = lib.mkOption { - description = lib.mdDoc "Unique number used to route packets."; + description = "Unique number used to route packets."; type = lib.types.int; example = 10; }; remoteServerIP = lib.mkOption { - description = lib.mdDoc "IP of the VPN server to connect to."; + description = "IP of the VPN server to connect to."; type = lib.types.str; }; sopsFile = lib.mkOption { - description = lib.mdDoc "Location of file holding authentication secrets for provider."; + description = "Location of file holding authentication secrets for provider."; type = lib.types.anything; }; proxyPort = lib.mkOption { - description = lib.mdDoc "If not null, sets up a proxy that listens on the given port and sends traffic to the VPN."; + description = "If not null, sets up a proxy that listens on the given port and sends traffic to the VPN."; type = lib.types.nullOr lib.types.int; default = null; }; diff --git a/modules/services/deluge.nix b/modules/services/deluge.nix index e3b4b52..9782573 100644 --- a/modules/services/deluge.nix +++ b/modules/services/deluge.nix @@ -40,13 +40,13 @@ in }; proxyPort = lib.mkOption { - description = lib.mdDoc "If not null, sets up a deluge to forward all traffic to the Proxy listening at that port."; + description = "If not null, sets up a deluge to forward all traffic to the Proxy listening at that port."; type = lib.types.nullOr lib.types.int; default = null; }; outgoingInterface = lib.mkOption { - description = lib.mdDoc "If not null, sets up a deluge to bind all outgoing traffic to the given interface."; + description = "If not null, sets up a deluge to bind all outgoing traffic to the given interface."; type = lib.types.nullOr lib.types.str; default = null; }; diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix index b8d7b44..c08c5ef 100644 --- a/modules/services/jellyfin.nix +++ b/modules/services/jellyfin.nix @@ -28,7 +28,7 @@ in }; domain = lib.mkOption { - description = lib.mdDoc "Domain to serve sites under."; + description = "Domain to serve sites under."; type = lib.types.str; example = "domain.com"; }; diff --git a/modules/services/nextcloud-server.nix b/modules/services/nextcloud-server.nix index d8d00de..c11becc 100644 --- a/modules/services/nextcloud-server.nix +++ b/modules/services/nextcloud-server.nix @@ -16,7 +16,7 @@ in }; domain = lib.mkOption { - description = lib.mdDoc "Domain to serve Nextcloud under."; + description = "Domain to serve Nextcloud under."; type = lib.types.str; example = "domain.com"; };