diff --git a/modules/accounts/calendar.nix b/modules/accounts/calendar.nix
index c38dbee59..e96f2f2dd 100644
--- a/modules/accounts/calendar.nix
+++ b/modules/accounts/calendar.nix
@@ -13,24 +13,24 @@ let
           type = types.str;
           default = "${cfg.basePath}/${name}";
           defaultText = "‹accounts.calendar.basePath›/‹name›";
-          description = lib.mdDoc "The path of the storage.";
+          description = "The path of the storage.";
         };
 
         type = mkOption {
           type = types.enum [ "filesystem" "singlefile" ];
-          description = lib.mdDoc "The type of the storage.";
+          description = "The type of the storage.";
         };
 
         fileExt = mkOption {
           type = types.nullOr types.str;
           default = null;
-          description = lib.mdDoc "The file extension to use.";
+          description = "The file extension to use.";
         };
 
         encoding = mkOption {
           type = types.nullOr types.str;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             File encoding for items, both content and file name.
             Defaults to UTF-8.
           '';
@@ -42,19 +42,19 @@ let
     options = {
       type = mkOption {
         type = types.enum [ "caldav" "http" "google_calendar" ];
-        description = lib.mdDoc "The type of the storage.";
+        description = "The type of the storage.";
       };
 
       url = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The URL of the storage.";
+        description = "The URL of the storage.";
       };
 
       userName = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "User name for authentication.";
+        description = "User name for authentication.";
       };
 
       # userNameCommand = mkOption {
@@ -70,7 +70,7 @@ let
         type = types.nullOr (types.listOf types.str);
         default = null;
         example = [ "pass" "caldav" ];
-        description = lib.mdDoc ''
+        description = ''
           A command that prints the password to standard output.
         '';
       };
@@ -82,7 +82,7 @@ let
       name = mkOption {
         type = types.str;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           Unique identifier of the calendar. This is set to the
           attribute name of the calendar configuration.
         '';
@@ -91,7 +91,7 @@ let
       primary = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether this is the primary account. Only one account may be
           set as primary.
         '';
@@ -99,7 +99,7 @@ let
 
       primaryCollection = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           The primary collection of the account. Required when an
           account has multiple collections.
         '';
@@ -108,7 +108,7 @@ let
       local = mkOption {
         type = types.nullOr (localModule name);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Local configuration for the calendar.
         '';
       };
@@ -116,7 +116,7 @@ let
       remote = mkOption {
         type = types.nullOr remoteModule;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Remote configuration for the calendar.
         '';
       };
@@ -131,7 +131,7 @@ in {
       type = types.str;
       apply = p:
         if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
-      description = lib.mdDoc ''
+      description = ''
         The base directory in which to save calendars. May be a
         relative path, in which case it is relative the home
         directory.
@@ -146,7 +146,7 @@ in {
         (import ../programs/khal-calendar-accounts.nix)
       ]);
       default = { };
-      description = lib.mdDoc "List of calendars.";
+      description = "List of calendars.";
     };
   };
   config = mkIf (cfg.accounts != { }) {
diff --git a/modules/accounts/contacts.nix b/modules/accounts/contacts.nix
index 6f117d0bc..83f57d8e2 100644
--- a/modules/accounts/contacts.nix
+++ b/modules/accounts/contacts.nix
@@ -13,24 +13,24 @@ let
           type = types.str;
           default = "${cfg.basePath}/${name}";
           defaultText = "‹accounts.contact.basePath›/‹name›";
-          description = lib.mdDoc "The path of the storage.";
+          description = "The path of the storage.";
         };
 
         type = mkOption {
           type = types.enum [ "filesystem" "singlefile" ];
-          description = lib.mdDoc "The type of the storage.";
+          description = "The type of the storage.";
         };
 
         fileExt = mkOption {
           type = types.nullOr types.str;
           default = null;
-          description = lib.mdDoc "The file extension to use.";
+          description = "The file extension to use.";
         };
 
         encoding = mkOption {
           type = types.nullOr types.str;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             File encoding for items, both content and file name.
             Defaults to UTF-8.
           '';
@@ -42,19 +42,19 @@ let
     options = {
       type = mkOption {
         type = types.enum [ "carddav" "http" "google_contacts" ];
-        description = lib.mdDoc "The type of the storage.";
+        description = "The type of the storage.";
       };
 
       url = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The URL of the storage.";
+        description = "The URL of the storage.";
       };
 
       userName = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "User name for authentication.";
+        description = "User name for authentication.";
       };
 
       # userNameCommand = mkOption {
@@ -70,7 +70,7 @@ let
         type = types.nullOr (types.listOf types.str);
         default = null;
         example = [ "pass" "caldav" ];
-        description = lib.mdDoc ''
+        description = ''
           A command that prints the password to standard output.
         '';
       };
@@ -82,7 +82,7 @@ let
       name = mkOption {
         type = types.str;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           Unique identifier of the contact account. This is set to the
           attribute name of the contact configuration.
         '';
@@ -91,7 +91,7 @@ let
       local = mkOption {
         type = types.nullOr (localModule name);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Local configuration for the contacts.
         '';
       };
@@ -99,7 +99,7 @@ let
       remote = mkOption {
         type = types.nullOr remoteModule;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Remote configuration for the contacts.
         '';
       };
@@ -114,7 +114,7 @@ in {
       type = types.str;
       apply = p:
         if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
-      description = lib.mdDoc ''
+      description = ''
         The base directory in which to save contacts. May be a
         relative path, in which case it is relative the home
         directory.
@@ -128,7 +128,7 @@ in {
         (import ../programs/khal-accounts.nix)
       ]);
       default = { };
-      description = lib.mdDoc "List of contacts.";
+      description = "List of contacts.";
     };
   };
 }
diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix
index 63a6b10ee..f33b3ffe4 100644
--- a/modules/accounts/email.nix
+++ b/modules/accounts/email.nix
@@ -10,7 +10,7 @@ let
     options = {
       key = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           The key to use as listed in {command}`gpg --list-keys`.
         '';
       };
@@ -18,13 +18,13 @@ let
       signByDefault = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Sign messages by default.";
+        description = "Sign messages by default.";
       };
 
       encryptByDefault = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Encrypt outgoing messages by default.";
+        description = "Encrypt outgoing messages by default.";
       };
     };
   };
@@ -39,7 +39,7 @@ let
           Luke Skywalker
           May the force be with you.
         '';
-        description = lib.mdDoc ''
+        description = ''
           Signature content.
         '';
       };
@@ -52,7 +52,7 @@ let
         example = literalExpression ''
           ~*~*~*~*~*~*~*~*~*~*~*~
         '';
-        description = lib.mdDoc ''
+        description = ''
           The delimiter used between the document and the signature.
         '';
       };
@@ -63,13 +63,13 @@ let
         example = literalExpression ''
           pkgs.writeScript "signature" "echo This is my signature"
         '';
-        description = lib.mdDoc "A command that generates a signature.";
+        description = "A command that generates a signature.";
       };
 
       showSignature = mkOption {
         type = types.enum [ "append" "attach" "none" ];
         default = "none";
-        description = lib.mdDoc "Method to communicate the signature.";
+        description = "Method to communicate the signature.";
       };
     };
   };
@@ -79,7 +79,7 @@ let
       enable = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable TLS/SSL.
         '';
       };
@@ -87,7 +87,7 @@ let
       useStartTls = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to use STARTTLS.
         '';
       };
@@ -96,7 +96,7 @@ let
         type = types.nullOr types.path;
         default = config.accounts.email.certificatesFile;
         defaultText = "config.accounts.email.certificatesFile";
-        description = lib.mdDoc ''
+        description = ''
           Path to file containing certificate authorities that should
           be used to validate the connection authenticity. If
           `null` then the system default is used.
@@ -111,7 +111,7 @@ let
       host = mkOption {
         type = types.str;
         example = "imap.example.org";
-        description = lib.mdDoc ''
+        description = ''
           Hostname of IMAP server.
         '';
       };
@@ -120,7 +120,7 @@ let
         type = types.nullOr types.port;
         default = null;
         example = 993;
-        description = lib.mdDoc ''
+        description = ''
           The port on which the IMAP server listens. If
           `null` then the default port is used.
         '';
@@ -129,7 +129,7 @@ let
       tls = mkOption {
         type = tlsModule;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration for secure connections.
         '';
       };
@@ -142,7 +142,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "jmap.example.org";
-        description = lib.mdDoc ''
+        description = ''
           Hostname of JMAP server.
 
           If both this option and [](#opt-accounts.email.accounts._name_.jmap.sessionUrl) are specified,
@@ -155,7 +155,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "https://jmap.example.org:443/.well-known/jmap";
-        description = lib.mdDoc ''
+        description = ''
           URL for the JMAP Session resource.
 
           If both this option and [](#opt-accounts.email.accounts._name_.jmap.host) are specified,
@@ -171,7 +171,7 @@ let
       host = mkOption {
         type = types.str;
         example = "smtp.example.org";
-        description = lib.mdDoc ''
+        description = ''
           Hostname of SMTP server.
         '';
       };
@@ -180,7 +180,7 @@ let
         type = types.nullOr types.port;
         default = null;
         example = 465;
-        description = lib.mdDoc ''
+        description = ''
           The port on which the SMTP server listens. If
           `null` then the default port is used.
         '';
@@ -189,7 +189,7 @@ let
       tls = mkOption {
         type = tlsModule;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration for secure connections.
         '';
       };
@@ -200,7 +200,7 @@ let
     options = {
       path = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           Path to maildir directory where mail for this account is
           stored. This is relative to the base maildir path.
         '';
@@ -211,7 +211,7 @@ let
         readOnly = true;
         internal = true;
         default = "${cfg.maildirBasePath}/${config.path}";
-        description = lib.mdDoc ''
+        description = ''
           A convenience option whose value is the absolute path of
           this maildir.
         '';
@@ -224,7 +224,7 @@ let
       name = mkOption {
         type = types.str;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           Unique identifier of the account. This is set to the
           attribute name of the account configuration.
         '';
@@ -233,7 +233,7 @@ let
       primary = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether this is the primary account. Only one account may be
           set as primary.
         '';
@@ -249,7 +249,7 @@ let
           "outlook.office365.com"
         ];
         default = "plain";
-        description = lib.mdDoc ''
+        description = ''
           Some email providers have peculiar behavior that require
           special treatment. This option is therefore intended to
           indicate the nature of the provider.
@@ -263,26 +263,26 @@ let
       address = mkOption {
         type = types.strMatching ".*@.*";
         example = "jane.doe@example.org";
-        description = lib.mdDoc "The email address of this account.";
+        description = "The email address of this account.";
       };
 
       aliases = mkOption {
         type = types.listOf (types.strMatching ".*@.*");
         default = [ ];
         example = [ "webmaster@example.org" "admin@example.org" ];
-        description = lib.mdDoc "Alternative email addresses of this account.";
+        description = "Alternative email addresses of this account.";
       };
 
       realName = mkOption {
         type = types.str;
         example = "Jane Doe";
-        description = lib.mdDoc "Name displayed when sending mails.";
+        description = "Name displayed when sending mails.";
       };
 
       userName = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The server username of this account. This will be used as
           the SMTP, IMAP, and JMAP user name.
         '';
@@ -293,7 +293,7 @@ let
         default = null;
         apply = p: if isString p then splitString " " p else p;
         example = "secret-tool lookup email me@example.org";
-        description = lib.mdDoc ''
+        description = ''
           A command, which when run writes the account password on
           standard output.
         '';
@@ -305,7 +305,7 @@ let
             inbox = mkOption {
               type = types.str;
               default = "Inbox";
-              description = lib.mdDoc ''
+              description = ''
                 Relative path of the inbox mail.
               '';
             };
@@ -313,7 +313,7 @@ let
             sent = mkOption {
               type = types.nullOr types.str;
               default = "Sent";
-              description = lib.mdDoc ''
+              description = ''
                 Relative path of the sent mail folder.
               '';
             };
@@ -321,7 +321,7 @@ let
             drafts = mkOption {
               type = types.nullOr types.str;
               default = "Drafts";
-              description = lib.mdDoc ''
+              description = ''
                 Relative path of the drafts mail folder.
               '';
             };
@@ -329,14 +329,14 @@ let
             trash = mkOption {
               type = types.str;
               default = "Trash";
-              description = lib.mdDoc ''
+              description = ''
                 Relative path of the deleted mail folder.
               '';
             };
           };
         };
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Standard email folders.
         '';
       };
@@ -344,7 +344,7 @@ let
       imap = mkOption {
         type = types.nullOr imapModule;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The IMAP configuration to use for this account.
         '';
       };
@@ -352,7 +352,7 @@ let
       jmap = mkOption {
         type = types.nullOr jmapModule;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The JMAP configuration to use for this account.
         '';
       };
@@ -360,7 +360,7 @@ let
       signature = mkOption {
         type = signatureModule;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Signature configuration.
         '';
       };
@@ -368,7 +368,7 @@ let
       gpg = mkOption {
         type = types.nullOr gpgModule;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           GPG configuration.
         '';
       };
@@ -376,7 +376,7 @@ let
       smtp = mkOption {
         type = types.nullOr smtpModule;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The SMTP configuration to use for this account.
         '';
       };
@@ -384,7 +384,7 @@ let
       maildir = mkOption {
         type = types.nullOr maildirModule;
         defaultText = { path = "\${name}"; };
-        description = lib.mdDoc ''
+        description = ''
           Maildir configuration for this account.
         '';
       };
@@ -477,7 +477,7 @@ in {
     certificatesFile = mkOption {
       type = types.nullOr types.path;
       default = "/etc/ssl/certs/ca-certificates.crt";
-      description = lib.mdDoc ''
+      description = ''
         Path to default file containing certificate authorities that
         should be used to validate the connection authenticity. This
         path may be overridden on a per-account basis.
@@ -490,7 +490,7 @@ in {
       defaultText = "$HOME/Maildir";
       apply = p:
         if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}";
-      description = lib.mdDoc ''
+      description = ''
         The base directory for account maildir directories. May be a
         relative path, in which case it is relative the home
         directory.
@@ -500,7 +500,7 @@ in {
     accounts = mkOption {
       type = types.attrsOf (types.submodule mailAccountOpts);
       default = { };
-      description = lib.mdDoc "List of email accounts.";
+      description = "List of email accounts.";
     };
   };
 
diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index 0645f1283..a64ccc50e 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -11,40 +11,39 @@ let
       package = mkOption {
         type = types.package;
         example = literalExpression "pkgs.vanilla-dmz";
-        description = lib.mdDoc "Package providing the cursor theme.";
+        description = "Package providing the cursor theme.";
       };
 
       name = mkOption {
         type = types.str;
         example = "Vanilla-DMZ";
-        description = lib.mdDoc "The cursor name within the package.";
+        description = "The cursor name within the package.";
       };
 
       size = mkOption {
         type = types.int;
         default = 32;
         example = 64;
-        description = lib.mdDoc "The cursor size.";
+        description = "The cursor size.";
       };
 
       x11 = {
-        enable = mkEnableOption (lib.mdDoc ''
+        enable = mkEnableOption ''
           x11 config generation for {option}`home.pointerCursor`
-        '');
+        '';
 
         defaultCursor = mkOption {
           type = types.str;
           default = "left_ptr";
           example = "X_cursor";
-          description =
-            lib.mdDoc "The default cursor file to use within the package.";
+          description = "The default cursor file to use within the package.";
         };
       };
 
       gtk = {
-        enable = mkEnableOption (lib.mdDoc ''
+        enable = mkEnableOption ''
           gtk config generation for {option}`home.pointerCursor`
-        '');
+        '';
       };
     };
   };
@@ -57,22 +56,22 @@ in {
   meta.maintainers = [ maintainers.polykernel maintainers.league ];
 
   imports = [
-    (mkAliasOptionModuleMD [ "xsession" "pointerCursor" "package" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [
       "home"
       "pointerCursor"
       "package"
     ])
-    (mkAliasOptionModuleMD [ "xsession" "pointerCursor" "name" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "name" ] [
       "home"
       "pointerCursor"
       "name"
     ])
-    (mkAliasOptionModuleMD [ "xsession" "pointerCursor" "size" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "size" ] [
       "home"
       "pointerCursor"
       "size"
     ])
-    (mkAliasOptionModuleMD [ "xsession" "pointerCursor" "defaultCursor" ] [
+    (mkAliasOptionModule [ "xsession" "pointerCursor" "defaultCursor" ] [
       "home"
       "pointerCursor"
       "x11"
@@ -95,7 +94,7 @@ in {
     home.pointerCursor = mkOption {
       type = types.nullOr pointerCursorModule;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Cursor configuration. Set to `null` to disable.
 
         Top-level options declared under this submodule are backend independent
diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix
index 7cb12d7ce..2efb53d62 100644
--- a/modules/config/i18n.nix
+++ b/modules/config/i18n.nix
@@ -40,7 +40,7 @@ in {
   options = {
     i18n.glibcLocales = mkOption {
       type = types.path;
-      description = lib.mdDoc ''
+      description = ''
         Customized `glibcLocales` package providing
         the `LOCALE_ARCHIVE_*` environment variable.
 
diff --git a/modules/files.nix b/modules/files.nix
index 44de392a7..c869df1d8 100644
--- a/modules/files.nix
+++ b/modules/files.nix
@@ -26,7 +26,7 @@ in
 {
   options = {
     home.file = mkOption {
-      description = lib.mdDoc "Attribute set of files to link into the user home.";
+      description = "Attribute set of files to link into the user home.";
       default = {};
       type = fileType "home.file" "{env}`HOME`" homeDirectory;
     };
@@ -34,7 +34,7 @@ in
     home-files = mkOption {
       type = types.package;
       internal = true;
-      description = lib.mdDoc "Package to contain all home files";
+      description = "Package to contain all home files";
     };
   };
 
diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index c3c3aa534..722812cc1 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -13,7 +13,7 @@ let
       base = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use unless overridden by a more specific option.
         '';
       };
@@ -21,7 +21,7 @@ let
       ctype = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Character classification category.
         '';
       };
@@ -29,7 +29,7 @@ let
       numeric = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for numerical values.
         '';
       };
@@ -37,7 +37,7 @@ let
       time = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for formatting times.
         '';
       };
@@ -45,7 +45,7 @@ let
       collate = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for collation (alphabetical ordering).
         '';
       };
@@ -53,7 +53,7 @@ let
       monetary = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for formatting currencies and money amounts.
         '';
       };
@@ -61,7 +61,7 @@ let
       messages = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for messages, application UI languages, etc.
         '';
       };
@@ -69,7 +69,7 @@ let
       paper = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for paper sizes.
         '';
       };
@@ -77,7 +77,7 @@ let
       name = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for personal names.
         '';
       };
@@ -85,7 +85,7 @@ let
       address = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for addresses.
         '';
       };
@@ -93,7 +93,7 @@ let
       telephone = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for telephone numbers.
         '';
       };
@@ -101,7 +101,7 @@ let
       measurement = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The language to use for measurement values.
         '';
       };
@@ -118,7 +118,7 @@ let
           then null
           else "us";
         defaultText = literalExpression "null";
-        description = lib.mdDoc ''
+        description = ''
           Keyboard layout. If `null`, then the system
           configuration will be used.
 
@@ -131,7 +131,7 @@ let
         type = with types; nullOr str;
         default = null;
         example = "presario";
-        description = lib.mdDoc ''
+        description = ''
           Keyboard model.
         '';
       };
@@ -140,7 +140,7 @@ let
         type = types.listOf types.str;
         default = [];
         example = ["grp:caps_toggle" "grp_led:scroll"];
-        description = lib.mdDoc ''
+        description = ''
           X keyboard options; layout switching goes here.
         '';
       };
@@ -153,7 +153,7 @@ let
           else "";
         defaultText = literalExpression "null";
         example = "colemak";
-        description = lib.mdDoc ''
+        description = ''
           X keyboard variant. If `null`, then the
           system configuration will be used.
 
@@ -189,7 +189,7 @@ in
         undefined for state version ≥ 20.09
       '';
       example = "jane.doe";
-      description = lib.mdDoc "The user's username.";
+      description = "The user's username.";
     };
 
     home.homeDirectory = mkOption {
@@ -200,7 +200,7 @@ in
       '';
       apply = toString;
       example = "/home/jane.doe";
-      description = lib.mdDoc "The user's home directory. Must be an absolute path.";
+      description = "The user's home directory. Must be an absolute path.";
     };
 
     home.profileDirectory = mkOption {
@@ -210,7 +210,7 @@ in
         "/etc/profiles/per-user/''${home.username}"
       '';
       readOnly = true;
-      description = lib.mdDoc ''
+      description = ''
         The profile directory where Home Manager generations are installed.
       '';
     };
@@ -218,7 +218,7 @@ in
     home.language = mkOption {
       type = languageSubModule;
       default = {};
-      description = lib.mdDoc "Language configuration.";
+      description = "Language configuration.";
     };
 
     home.keyboard = mkOption {
@@ -228,7 +228,7 @@ in
         "{ }"  for state version < 21.11,
         "null" for state version ≥ 21.11
       '';
-      description = lib.mdDoc ''
+      description = ''
         Keyboard configuration. Set to `null` to
         disable Home Manager keyboard management.
       '';
@@ -243,7 +243,7 @@ in
           "..." = "cd ../..";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         An attribute set that maps aliases (the top level attribute names
         in this option) to command strings or directly to build outputs.
 
@@ -258,7 +258,7 @@ in
       default = {};
       type = with types; lazyAttrsOf (oneOf [ str path int float ]);
       example = { EDITOR = "emacs"; GS_OPTIONS = "-sPAPERSIZE=a4"; };
-      description = lib.mdDoc ''
+      description = ''
         Environment variables to always set at login.
 
         The values may refer to other environment variables using
@@ -294,7 +294,7 @@ in
     home.sessionVariablesPackage = mkOption {
       type = types.package;
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         The package containing the
         {file}`hm-session-vars.sh` file.
       '';
@@ -308,7 +308,7 @@ in
         "\${xdg.configHome}/emacs/bin"
         ".git/safe/../../bin"
       ];
-      description = lib.mdDoc ''
+      description = ''
         Extra directories to add to {env}`PATH`.
 
         These directories are added to the {env}`PATH` variable in a
@@ -323,7 +323,7 @@ in
       type = types.lines;
       default = "";
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration to add to the
         {file}`hm-session-vars.sh` file.
       '';
@@ -332,14 +332,14 @@ in
     home.packages = mkOption {
       type = types.listOf types.package;
       default = [];
-      description = lib.mdDoc "The set of packages to appear in the user environment.";
+      description = "The set of packages to appear in the user environment.";
     };
 
     home.extraOutputsToInstall = mkOption {
       type = types.listOf types.str;
       default = [];
       example = [ "doc" "info" "devdoc" ];
-      description = lib.mdDoc ''
+      description = ''
         List of additional package outputs of the packages
         {var}`home.packages` that should be installed into
         the user environment.
@@ -348,7 +348,7 @@ in
 
     home.path = mkOption {
       internal = true;
-      description = lib.mdDoc "The derivation installing the user packages.";
+      description = "The derivation installing the user packages.";
     };
 
     home.emptyActivationPath = mkOption {
@@ -359,7 +359,7 @@ in
         false   for state version < 22.11,
         true    for state version ≥ 22.11
       '';
-      description = lib.mdDoc ''
+      description = ''
         Whether the activation script should start with an empty
         {env}`PATH` variable. When `false` then the
         user's {env}`PATH` will be accessible in the script. It is
@@ -379,7 +379,7 @@ in
           ''';
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         The activation scripts blocks to run when activating a Home
         Manager generation. Any entry here should be idempotent,
         meaning running twice or more times produces the same result
@@ -414,14 +414,14 @@ in
     home.activationPackage = mkOption {
       internal = true;
       type = types.package;
-      description = lib.mdDoc "The package containing the complete activation script.";
+      description = "The package containing the complete activation script.";
     };
 
     home.extraActivationPath = mkOption {
       internal = true;
       type = types.listOf types.package;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         Extra packages to add to {env}`PATH` within the activation
         script.
       '';
@@ -431,7 +431,7 @@ in
       type = types.lines;
       default = "";
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         Extra commands to run in the Home Manager generation builder.
       '';
     };
@@ -440,7 +440,7 @@ in
       type = types.lines;
       default = "";
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         Extra commands to run in the Home Manager profile builder.
       '';
     };
@@ -448,7 +448,7 @@ in
     home.enableNixpkgsReleaseCheck = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Determines whether to check for release version mismatch between Home
         Manager and Nixpkgs. Using mismatched versions is likely to cause errors
         and unexpected behavior. It is therefore highly recommended to use a
diff --git a/modules/i18n/input-method/default.nix b/modules/i18n/input-method/default.nix
index d450fcee1..5e3a89b33 100644
--- a/modules/i18n/input-method/default.nix
+++ b/modules/i18n/input-method/default.nix
@@ -31,7 +31,7 @@ in {
           (types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]);
         default = null;
         example = "fcitx5";
-        description = lib.mdDoc ''
+        description = ''
           Select the enabled input method. Input methods are software to input
           symbols that are not available on standard input devices.
 
@@ -65,7 +65,7 @@ in {
         internal = true;
         type = types.nullOr types.path;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The input method method package.
         '';
       };
diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix
index c730a2b35..78eb97083 100644
--- a/modules/i18n/input-method/fcitx5.nix
+++ b/modules/i18n/input-method/fcitx5.nix
@@ -13,7 +13,7 @@ in {
         type = with types; listOf package;
         default = [ ];
         example = literalExpression "with pkgs; [ fcitx5-rime ]";
-        description = lib.mdDoc ''
+        description = ''
           Enabled Fcitx5 addons.
         '';
       };
diff --git a/modules/i18n/input-method/kime.nix b/modules/i18n/input-method/kime.nix
index 4d47de1f2..5608b54e4 100644
--- a/modules/i18n/input-method/kime.nix
+++ b/modules/i18n/input-method/kime.nix
@@ -26,7 +26,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           kime configuration. Refer to
           <https://github.com/Riey/kime/blob/develop/docs/CONFIGURATION.md>
           for details on supported values.
diff --git a/modules/i18n/input-method/uim.nix b/modules/i18n/input-method/uim.nix
index 7c0e1dee1..e7890352c 100644
--- a/modules/i18n/input-method/uim.nix
+++ b/modules/i18n/input-method/uim.nix
@@ -11,7 +11,7 @@ in {
         type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
         default = "gtk";
         example = "gtk-systray";
-        description = lib.mdDoc ''
+        description = ''
           Selected UIM toolbar.
         '';
       };
diff --git a/modules/launchd/default.nix b/modules/launchd/default.nix
index 68ae554d1..90e5360de 100644
--- a/modules/launchd/default.nix
+++ b/modules/launchd/default.nix
@@ -12,7 +12,7 @@ let
 
   launchdConfig = { config, name, ... }: {
     options = {
-      enable = mkEnableOption (lib.mdDoc name);
+      enable = mkEnableOption name;
       config = mkOption {
         type = types.submodule (import ./launchd.nix);
         default = { };
@@ -27,7 +27,7 @@ let
             ];
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Define a launchd job. See {manpage}`launchd.plist(5)` for details.
         '';
       };
@@ -64,7 +64,7 @@ in {
       type = types.bool;
       default = isDarwin;
       defaultText = literalExpression "pkgs.stdenv.hostPlatform.isDarwin";
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Home Manager to define per-user daemons by making use
         of launchd's LaunchAgents.
       '';
@@ -73,7 +73,7 @@ in {
     agents = mkOption {
       type = with types; attrsOf (submodule launchdConfig);
       default = { };
-      description = lib.mdDoc "Define LaunchAgents.";
+      description = "Define LaunchAgents.";
     };
   };
 
diff --git a/modules/launchd/launchd.nix b/modules/launchd/launchd.nix
index fc0d505df..9c9b54452 100644
--- a/modules/launchd/launchd.nix
+++ b/modules/launchd/launchd.nix
@@ -33,14 +33,13 @@ with lib;
   options = {
     Label = mkOption {
       type = types.str;
-      description =
-        lib.mdDoc "This required key uniquely identifies the job to launchd.";
+      description = "This required key uniquely identifies the job to launchd.";
     };
 
     Disabled = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used as a hint to `launchctl(1)` that it should not submit this job to launchd when
         loading a job or jobs. The value of this key does NOT reflect the current state of the job on the running
         system. If you wish to know whether a job is loaded in launchd, reading this key from a configuration
@@ -63,7 +62,7 @@ with lib;
     UserName = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies the user to run the job as. This key is only applicable when launchd is
         running as root.
       '';
@@ -72,7 +71,7 @@ with lib;
     GroupName = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies the group to run the job as. This key is only applicable when launchd is
         running as root. If UserName is set and GroupName is not, the the group will be set to the default
         group of the user.
@@ -82,7 +81,7 @@ with lib;
     inetdCompatibility = mkOption {
       default = null;
       example = { Wait = true; };
-      description = lib.mdDoc ''
+      description = ''
         The presence of this key specifies that the daemon expects to be run as if it were launched from inetd.
       '';
       type = types.nullOr (types.submodule {
@@ -90,7 +89,7 @@ with lib;
           Wait = mkOption {
             type = types.nullOr (types.either types.bool types.str);
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This flag corresponds to the "wait" or "nowait" option of inetd. If true, then the listening
               socket is passed via the standard in/out/error file descriptors. If false, then `accept(2)` is
               called on behalf of the job, and the result is passed via the standard in/out/error descriptors.
@@ -103,7 +102,7 @@ with lib;
     LimitLoadToHosts = mkOption {
       type = types.nullOr (types.listOf types.str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This configuration file only applies to the hosts listed with this key. Note: One should set kern.hostname
         in `sysctl.conf(5)` for this feature to work reliably.
       '';
@@ -112,7 +111,7 @@ with lib;
     LimitLoadFromHosts = mkOption {
       type = types.nullOr (types.listOf types.str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This configuration file only applies to hosts NOT listed with this key. Note: One should set kern.hostname
         in `sysctl.conf(5)` for this feature to work reliably.
       '';
@@ -121,7 +120,7 @@ with lib;
     LimitLoadToSessionType = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This configuration file only applies to sessions of the type specified. This key is used in concert
         with the -S flag to {command}`launchctl`.
       '';
@@ -130,7 +129,7 @@ with lib;
     Program = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This key maps to the first argument of `execvp(3)`.  If this key is missing, then the first element of
         the array of strings provided to the ProgramArguments will be used instead.  This key is required in
         the absence of the ProgramArguments key.
@@ -140,7 +139,7 @@ with lib;
     ProgramArguments = mkOption {
       type = types.nullOr (types.listOf types.str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This key maps to the second argument of `execvp(3)`.  This key is required in the absence of the Program
         key. Please note: many people are confused by this key. Please read `execvp(3)` very carefully!
       '';
@@ -149,7 +148,7 @@ with lib;
     EnableGlobbing = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This flag causes launchd to use the `glob(3)` mechanism to update the program arguments before invocation.
       '';
     };
@@ -157,7 +156,7 @@ with lib;
     EnableTransactions = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This flag instructs launchd that the job promises to use `vproc_transaction_begin(3)` and
         `vproc_transaction_end(3)` to track outstanding transactions that need to be reconciled before the
         process can safely terminate. If no outstanding transactions are in progress, then launchd is free to
@@ -168,7 +167,7 @@ with lib;
     OnDemand = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This key was used in Mac OS X 10.4 to control whether a job was kept alive or not. The default was
         true.  This key has been deprecated and replaced in Mac OS X 10.5 and later with the more powerful
         KeepAlive option.
@@ -182,7 +181,7 @@ with lib;
           SuccessfulExit = mkOption {
             type = types.nullOr types.bool;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               If true, the job will be restarted as long as the program exits and with an exit status of zero.
               If false, the job will be restarted in the inverse condition.  This key implies that "RunAtLoad"
               is set to true, since the job needs to run at least once before we can get an exit status.
@@ -192,7 +191,7 @@ with lib;
           NetworkState = mkOption {
             type = types.nullOr types.bool;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               If true, the job will be kept alive as long as the network is up, where up is defined as at least
               one non-loopback interface being up and having IPv4 or IPv6 addresses assigned to them.  If
               false, the job will be kept alive in the inverse condition.
@@ -202,7 +201,7 @@ with lib;
           PathState = mkOption {
             type = types.nullOr (types.attrsOf types.bool);
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               Each key in this dictionary is a file-system path. If the value of the key is true, then the job
               will be kept alive as long as the path exists.  If false, the job will be kept alive in the
               inverse condition. The intent of this feature is that two or more jobs may create semaphores in
@@ -213,7 +212,7 @@ with lib;
           OtherJobEnabled = mkOption {
             type = types.nullOr (types.attrsOf types.bool);
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               Each key in this dictionary is the label of another job. If the value of the key is true, then
               this job is kept alive as long as that other job is enabled. Otherwise, if the value is false,
               then this job is kept alive as long as the other job is disabled.  This feature should not be
@@ -224,7 +223,7 @@ with lib;
           Crashed = mkOption {
             type = types.nullOr types.bool;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               If true, the the job will be restarted as long as it exited due to a signal which is typically
               associated with a crash (SIGILL, SIGSEGV, etc.). If false, the job will be restarted in the
               inverse condition.
@@ -239,7 +238,7 @@ with lib;
         };
       }));
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to control whether your job is to be kept continuously running or to let
         demand and conditions control the invocation. The default is false and therefore only demand will start
         the job. The value may be set to true to unconditionally keep the job alive. Alternatively, a dictionary
@@ -254,7 +253,7 @@ with lib;
     RunAtLoad = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to control whether your job is launched once at the time the job is loaded.
         The default is false.
       '';
@@ -263,7 +262,7 @@ with lib;
     RootDirectory = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to specify a directory to `chroot(2)` to before running the job.
       '';
     };
@@ -271,7 +270,7 @@ with lib;
     WorkingDirectory = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to specify a directory to `chdir(2)` to before running the job.
       '';
     };
@@ -279,7 +278,7 @@ with lib;
     EnvironmentVariables = mkOption {
       type = types.nullOr (types.attrsOf types.str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to specify additional environment variables to be set before running the
         job.
       '';
@@ -288,7 +287,7 @@ with lib;
     Umask = mkOption {
       type = types.nullOr types.int;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies what value should be passed to `umask(2)` before running the job. Known bug:
         Property lists don't support octal, so please convert the value to decimal.
       '';
@@ -297,7 +296,7 @@ with lib;
     TimeOut = mkOption {
       type = types.nullOr types.int;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         The recommended idle time out (in seconds) to pass to the job. If no value is specified, a default time
         out will be supplied by launchd for use by the job at check in time.
       '';
@@ -306,7 +305,7 @@ with lib;
     ExitTimeOut = mkOption {
       type = types.nullOr types.int;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         The amount of time launchd waits before sending a SIGKILL signal. The default value is 20 seconds. The
         value zero is interpreted as infinity.
       '';
@@ -315,7 +314,7 @@ with lib;
     ThrottleInterval = mkOption {
       type = types.nullOr types.int;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This key lets one override the default throttling policy imposed on jobs by launchd.  The value is in
         seconds, and by default, jobs will not be spawned more than once every 10 seconds.  The principle
         behind this is that jobs should linger around just in case they are needed again in the near future.
@@ -327,7 +326,7 @@ with lib;
     InitGroups = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies whether `initgroups(3)` should be called before running the job.  The default
         is true in 10.5 and false in 10.4. This key will be ignored if the UserName key is not set.
       '';
@@ -336,7 +335,7 @@ with lib;
     WatchPaths = mkOption {
       type = types.nullOr (types.listOf types.path);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key causes the job to be started if any one of the listed paths are modified.
       '';
     };
@@ -344,7 +343,7 @@ with lib;
     QueueDirectories = mkOption {
       type = types.nullOr (types.listOf types.str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Much like the WatchPaths option, this key will watch the paths for modifications. The difference being
         that the job will only be started if the path is a directory and the directory is not empty.
       '';
@@ -353,7 +352,7 @@ with lib;
     StartOnMount = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key causes the job to be started every time a filesystem is mounted.
       '';
     };
@@ -361,7 +360,7 @@ with lib;
     StartInterval = mkOption {
       type = types.nullOr types.int;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key causes the job to be started every N seconds.  If the system is asleep, the job will
         be started the next time the computer wakes up.  If multiple intervals transpire before the computer is
         woken, those events will be coalesced into one event upon wake from sleep.
@@ -374,7 +373,7 @@ with lib;
         Hour = 2;
         Minute = 30;
       };
-      description = lib.mdDoc ''
+      description = ''
         This optional key causes the job to be started every calendar interval as specified. Missing arguments
         are considered to be wildcard. The semantics are much like `crontab(5)`.  Unlike cron which skips job
         invocations when the computer is asleep, launchd will start the job the next time the computer wakes
@@ -386,7 +385,7 @@ with lib;
           Minute = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The minute on which this job will be run.
             '';
           };
@@ -394,7 +393,7 @@ with lib;
           Hour = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The hour on which this job will be run.
             '';
           };
@@ -402,7 +401,7 @@ with lib;
           Day = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The day on which this job will be run.
             '';
           };
@@ -410,7 +409,7 @@ with lib;
           Weekday = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The weekday on which this job will be run (0 and 7 are Sunday).
             '';
           };
@@ -418,7 +417,7 @@ with lib;
           Month = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The month on which this job will be run.
             '';
           };
@@ -429,7 +428,7 @@ with lib;
     StandardInPath = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies what file should be used for data being supplied to stdin when using
         `stdio(3)`.
       '';
@@ -438,7 +437,7 @@ with lib;
     StandardOutPath = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies what file should be used for data being sent to stdout when using `stdio(3)`.
       '';
     };
@@ -446,7 +445,7 @@ with lib;
     StandardErrorPath = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies what file should be used for data being sent to stderr when using `stdio(3)`.
       '';
     };
@@ -454,7 +453,7 @@ with lib;
     Debug = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies that launchd should adjust its log mask temporarily to LOG_DEBUG while
         dealing with this job.
       '';
@@ -463,7 +462,7 @@ with lib;
     WaitForDebugger = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies that launchd should instruct the kernel to have the job wait for a debugger
         to attach before any code in the job is executed.
       '';
@@ -471,7 +470,7 @@ with lib;
 
     SoftResourceLimits = mkOption {
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Resource limits to be imposed on the job. These adjust variables set with `setrlimit(2)`.  The following
         keys apply:
       '';
@@ -480,7 +479,7 @@ with lib;
           Core = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The largest size (in bytes) core file that may be created.
             '';
           };
@@ -488,7 +487,7 @@ with lib;
           CPU = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum amount of cpu time (in seconds) to be used by each process.
             '';
           };
@@ -496,7 +495,7 @@ with lib;
           Data = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) of the data segment for a process; this defines how far a program may
               extend its break with the `sbrk(2)` system call.
             '';
@@ -505,7 +504,7 @@ with lib;
           FileSize = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The largest size (in bytes) file that may be created.
             '';
           };
@@ -513,7 +512,7 @@ with lib;
           MemoryLock = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) which a process may lock into memory using the mlock(2) function.
             '';
           };
@@ -521,7 +520,7 @@ with lib;
           NumberOfFiles = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum number of open files for this process.  Setting this value in a system wide daemon
               will set the `sysctl(3)` kern.maxfiles (SoftResourceLimits) or kern.maxfilesperproc (HardResourceLimits)
               value in addition to the `setrlimit(2)` values.
@@ -531,7 +530,7 @@ with lib;
           NumberOfProcesses = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum number of simultaneous processes for this user id.  Setting this value in a system
               wide daemon will set the `sysctl(3)` kern.maxproc (SoftResourceLimits) or kern.maxprocperuid
               (HardResourceLimits) value in addition to the `setrlimit(2)` values.
@@ -541,7 +540,7 @@ with lib;
           ResidentSetSize = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) to which a process's resident set size may grow.  This imposes a
               limit on the amount of physical memory to be given to a process; if memory is tight, the system
               will prefer to take memory from processes that are exceeding their declared resident set size.
@@ -551,7 +550,7 @@ with lib;
           Stack = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) of the stack segment for a process; this defines how far a program's
               stack segment may be extended.  Stack extension is performed automatically by the system.
             '';
@@ -563,7 +562,7 @@ with lib;
     HardResourceLimits = mkOption {
       default = null;
       example = { NumberOfFiles = 4096; };
-      description = lib.mdDoc ''
+      description = ''
         Resource limits to be imposed on the job. These adjust variables set with `setrlimit(2)`.  The following
         keys apply:
       '';
@@ -572,7 +571,7 @@ with lib;
           Core = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The largest size (in bytes) core file that may be created.
             '';
           };
@@ -580,7 +579,7 @@ with lib;
           CPU = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum amount of cpu time (in seconds) to be used by each process.
             '';
           };
@@ -588,7 +587,7 @@ with lib;
           Data = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) of the data segment for a process; this defines how far a program may
               extend its break with the `sbrk(2)` system call.
             '';
@@ -597,7 +596,7 @@ with lib;
           FileSize = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The largest size (in bytes) file that may be created.
             '';
           };
@@ -605,7 +604,7 @@ with lib;
           MemoryLock = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) which a process may lock into memory using the `mlock(2)` function.
             '';
           };
@@ -613,7 +612,7 @@ with lib;
           NumberOfFiles = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum number of open files for this process.  Setting this value in a system wide daemon
               will set the `sysctl(3)` kern.maxfiles (SoftResourceLimits) or kern.maxfilesperproc (HardResourceLimits)
               value in addition to the `setrlimit(2)` values.
@@ -623,7 +622,7 @@ with lib;
           NumberOfProcesses = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum number of simultaneous processes for this user id.  Setting this value in a system
               wide daemon will set the `sysctl(3)` kern.maxproc (SoftResourceLimits) or kern.maxprocperuid
               (HardResourceLimits) value in addition to the `setrlimit(2)` values.
@@ -633,7 +632,7 @@ with lib;
           ResidentSetSize = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) to which a process's resident set size may grow.  This imposes a
               limit on the amount of physical memory to be given to a process; if memory is tight, the system
               will prefer to take memory from processes that are exceeding their declared resident set size.
@@ -643,7 +642,7 @@ with lib;
           Stack = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               The maximum size (in bytes) of the stack segment for a process; this defines how far a program's
               stack segment may be extended.  Stack extension is performed automatically by the system.
             '';
@@ -655,7 +654,7 @@ with lib;
     Nice = mkOption {
       type = types.nullOr types.int;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies what nice(3) value should be applied to the daemon.
       '';
     };
@@ -665,7 +664,7 @@ with lib;
         (types.enum [ "Background" "Standard" "Adaptive" "Interactive" ]);
       default = null;
       example = "Background";
-      description = lib.mdDoc ''
+      description = ''
         This optional key describes, at a high level, the intended purpose of the job.  The system will apply
         resource limits based on what kind of job it is. If left unspecified, the system will apply light
         resource limits to the job, throttling its CPU usage and I/O bandwidth. The following are valid values:
@@ -692,7 +691,7 @@ with lib;
     AbandonProcessGroup = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         When a job dies, launchd kills any remaining processes with the same process group ID as the job. Setting
         this key to true disables that behavior.
       '';
@@ -701,7 +700,7 @@ with lib;
     LowPriorityIO = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies whether the kernel should consider this daemon to be low priority when
         doing file system I/O.
       '';
@@ -710,7 +709,7 @@ with lib;
     LaunchOnlyOnce = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key specifies whether the job can only be run once and only once.  In other words, if the
         job cannot be safely respawned without a full machine reboot, then set this key to be true.
       '';
@@ -719,7 +718,7 @@ with lib;
     MachServices = mkOption {
       default = null;
       example = { ResetAtClose = true; };
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to specify Mach services to be registered with the Mach bootstrap sub-system.
         Each key in this dictionary should be the name of service to be advertised. The value of the key must
         be a boolean and set to true.  Alternatively, a dictionary can be used instead of a simple true value.
@@ -732,7 +731,7 @@ with lib;
           ResetAtClose = mkOption {
             type = types.nullOr types.bool;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               If this boolean is false, the port is recycled, thus leaving clients to remain oblivious to the
               demand nature of job. If the value is set to true, clients receive port death notifications when
               the job lets go of the receive right. The port will be recreated atomically with respect to bootstrap_look_up()
@@ -745,7 +744,7 @@ with lib;
           HideUntilCheckIn = mkOption {
             type = types.nullOr types.bool;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               Reserve the name in the namespace, but cause bootstrap_look_up() to fail until the job has
               checked in with launchd.
             '';
@@ -757,7 +756,7 @@ with lib;
     LaunchEvents = mkOption {
       type = types.nullOr (types.attrs);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Specifies higher-level event types to be used as launch-on-demand event
         sources.  Each sub-dictionary defines events for a particular event
         subsystem, such as "com.apple.iokit.matching", which can be used to
@@ -781,7 +780,7 @@ with lib;
 
     Sockets = mkOption {
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         This optional key is used to specify launch on demand sockets that can be used to let launchd know when
         to run the job. The job must check-in to get a copy of the file descriptors using APIs outlined in
         launch(3).  The keys of the top level Sockets dictionary can be anything. They are meant for the application
@@ -798,7 +797,7 @@ with lib;
           SockType = mkOption {
             type = types.nullOr (types.enum [ "stream" "dgram" "seqpacket" ]);
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key tells launchctl what type of socket to create. The default is "stream" and
               other valid values for this key are "dgram" and "seqpacket" respectively.
             '';
@@ -807,7 +806,7 @@ with lib;
           SockPassive = mkOption {
             type = types.nullOr types.bool;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key specifies whether `listen(2)` or `connect(2)` should be called on the created file
               descriptor. The default is true ("to listen").
             '';
@@ -816,7 +815,7 @@ with lib;
           SockNodeName = mkOption {
             type = types.nullOr types.str;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key specifies the node to `connect(2)` or `bind(2)` to.
             '';
           };
@@ -824,7 +823,7 @@ with lib;
           SockServiceName = mkOption {
             type = types.nullOr types.str;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key specifies the service on the node to `connect(2)` or `bind(2)` to.
             '';
           };
@@ -832,7 +831,7 @@ with lib;
           SockFamily = mkOption {
             type = types.nullOr (types.enum [ "IPv4" "IPv6" ]);
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key can be used to specifically request that "IPv4" or "IPv6" socket(s) be created.
             '';
           };
@@ -840,7 +839,7 @@ with lib;
           SockProtocol = mkOption {
             type = types.nullOr (types.enum [ "TCP" ]);
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key specifies the protocol to be passed to `socket(2)`.  The only value understood by
               this key at the moment is "TCP".
             '';
@@ -849,7 +848,7 @@ with lib;
           SockPathName = mkOption {
             type = types.nullOr types.path;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key implies SockFamily is set to "Unix". It specifies the path to `connect(2)` or
               `bind(2)` to.
             '';
@@ -858,7 +857,7 @@ with lib;
           SecureSocketWithKey = mkOption {
             type = types.nullOr types.str;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key is a variant of SockPathName. Instead of binding to a known path, a securely
               generated socket is created and the path is assigned to the environment variable that is inherited
               by all jobs spawned by launchd.
@@ -868,7 +867,7 @@ with lib;
           SockPathMode = mkOption {
             type = types.nullOr types.int;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key specifies the mode of the socket. Known bug: Property lists don't support
               octal, so please convert the value to decimal.
             '';
@@ -878,7 +877,7 @@ with lib;
             type =
               types.nullOr (types.either types.bool (types.listOf types.str));
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key can be used to request that the service be registered with the
               `mDNSResponder(8)`.  If the value is boolean, the service name is inferred from the SockServiceName.
             '';
@@ -887,7 +886,7 @@ with lib;
           MulticastGroup = mkOption {
             type = types.nullOr types.str;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               This optional key can be used to request that the datagram socket join a multicast group.  If the
               value is a hostname, then `getaddrinfo(3)` will be used to join the correct multicast address for a
               given socket family.  If an explicit IPv4 or IPv6 address is given, it is required that the SockFamily
diff --git a/modules/lib/file-type.nix b/modules/lib/file-type.nix
index 537cb557b..cd3a3a627 100644
--- a/modules/lib/file-type.nix
+++ b/modules/lib/file-type.nix
@@ -19,7 +19,7 @@ in
         enable = mkOption {
           type = types.bool;
           default = true;
-          description = lib.mdDoc ''
+          description = ''
             Whether this file should be generated. This option allows specific
             files to be disabled.
           '';
@@ -32,7 +32,7 @@ in
             in
               removePrefix (homeDirectory + "/") absPath;
           defaultText = literalExpression "name";
-          description = lib.mdDoc ''
+          description = ''
             Path to target file relative to ${basePathDesc}.
           '';
         };
@@ -40,7 +40,7 @@ in
         text = mkOption {
           default = null;
           type = types.nullOr types.lines;
-          description = lib.mdDoc ''
+          description = ''
             Text of the file. If this option is null then
             [](#opt-${opt}._name_.source)
             must be set.
@@ -49,7 +49,7 @@ in
 
         source = mkOption {
           type = types.path;
-          description = lib.mdDoc ''
+          description = ''
             Path of the source file or directory. If
             [](#opt-${opt}._name_.text)
             is non-null then this option will automatically point to a file
@@ -60,7 +60,7 @@ in
         executable = mkOption {
           type = types.nullOr types.bool;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             Set the execute bit. If `null`, defaults to the mode
             of the {var}`source` file or to `false`
             for files created through the {var}`text` option.
@@ -70,7 +70,7 @@ in
         recursive = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             If the file source is a directory, then this option
             determines whether the directory should be recursively
             linked to the target location. This option has no effect
@@ -87,7 +87,7 @@ in
         onChange = mkOption {
           type = types.lines;
           default = "";
-          description = lib.mdDoc ''
+          description = ''
             Shell commands to run when file has changed between
             generations. The script will be run
             *after* the new files have been linked
@@ -102,7 +102,7 @@ in
           type = types.bool;
           default = false;
           visible = false;
-          description = lib.mdDoc ''
+          description = ''
             Whether the target path should be unconditionally replaced
             by the managed file source. Warning, this will silently
             delete the target regardless of whether it is a file or
diff --git a/modules/lib/types.nix b/modules/lib/types.nix
index 7c55c3495..056d3165b 100644
--- a/modules/lib/types.nix
+++ b/modules/lib/types.nix
@@ -39,7 +39,7 @@ in rec {
         type = types.nullOr types.package;
         default = null;
         example = literalExpression "pkgs.dejavu_fonts";
-        description = lib.mdDoc ''
+        description = ''
           Package providing the font. This package will be installed
           to your profile. If `null` then the font
           is assumed to already be available in your profile.
@@ -49,7 +49,7 @@ in rec {
       name = mkOption {
         type = types.str;
         example = "DejaVu Sans";
-        description = lib.mdDoc ''
+        description = ''
           The family name of the font within the package.
         '';
       };
@@ -58,7 +58,7 @@ in rec {
         type = types.nullOr types.number;
         default = null;
         example = "8";
-        description = lib.mdDoc ''
+        description = ''
           The size of the font.
         '';
       };
diff --git a/modules/manual.nix b/modules/manual.nix
index 113213a16..84ec7eda0 100644
--- a/modules/manual.nix
+++ b/modules/manual.nix
@@ -16,7 +16,7 @@ in {
     manual.html.enable = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install the HTML manual. This also installs the
         {command}`home-manager-help` tool, which opens a local
         copy of the Home Manager manual in the system web browser.
@@ -27,7 +27,7 @@ in {
       type = types.bool;
       default = true;
       example = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install the configuration manual page. The manual can
         be reached by {command}`man home-configuration.nix`.
 
@@ -41,7 +41,7 @@ in {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to install a JSON formatted list of all Home Manager
         options. This can be located at
         {file}`<profile directory>/share/doc/home-manager/options.json`,
diff --git a/modules/misc/dconf.nix b/modules/misc/dconf.nix
index c637ea1d7..24e02a129 100644
--- a/modules/misc/dconf.nix
+++ b/modules/misc/dconf.nix
@@ -33,7 +33,7 @@ in {
         # re-enabled, unclear whether there's actual value in it though.
         default = !pkgs.stdenv.hostPlatform.isDarwin;
         visible = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable dconf settings.
 
           Note, if you use NixOS then you must add
@@ -57,7 +57,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Settings to write to the dconf configuration system.
 
           Note that the database is strongly-typed so you need to use the same types
diff --git a/modules/misc/debug.nix b/modules/misc/debug.nix
index 7e4cf2a0e..fc0d8946a 100644
--- a/modules/misc/debug.nix
+++ b/modules/misc/debug.nix
@@ -4,8 +4,8 @@ with lib;
 
 {
   options.home = {
-    enableDebugInfo = mkEnableOption (lib.mdDoc "") // {
-      description = lib.mdDoc ''
+    enableDebugInfo = mkEnableOption "" // {
+      description = ''
         Some Nix packages provide debug symbols for
         {command}`gdb` in the `debug` output.
         This option ensures that those are automatically fetched from
diff --git a/modules/misc/editorconfig.nix b/modules/misc/editorconfig.nix
index 289ba7f0c..a6dfb570a 100644
--- a/modules/misc/editorconfig.nix
+++ b/modules/misc/editorconfig.nix
@@ -12,12 +12,12 @@ in {
   meta.maintainers = with maintainers; [ loicreynier ];
 
   options.editorconfig = {
-    enable = mkEnableOption (lib.mdDoc "EditorConfig home configuration file");
+    enable = mkEnableOption "EditorConfig home configuration file";
 
     settings = mkOption {
       type = iniFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to {file}`$HOME/.editorconfig`.
         `root = true` is automatically added to the file,
         it must not be added here.
diff --git a/modules/misc/fontconfig.nix b/modules/misc/fontconfig.nix
index 5a861f968..49fef96a9 100644
--- a/modules/misc/fontconfig.nix
+++ b/modules/misc/fontconfig.nix
@@ -24,7 +24,7 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable fontconfig configuration. This will, for
           example, allow fontconfig to discover fonts and
           configurations installed through
diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index 85a231235..c20424b1f 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -31,7 +31,7 @@ let
         type = types.nullOr types.package;
         default = null;
         example = literalExpression "pkgs.gnome.gnome-themes-extra";
-        description = lib.mdDoc ''
+        description = ''
           Package providing the theme. This package will be installed
           to your profile. If `null` then the theme
           is assumed to already be available in your profile.
@@ -41,7 +41,7 @@ let
       name = mkOption {
         type = types.str;
         example = "Adwaita";
-        description = lib.mdDoc "The name of the theme within the package.";
+        description = "The name of the theme within the package.";
       };
     };
   };
@@ -52,7 +52,7 @@ let
         type = types.nullOr types.package;
         default = null;
         example = literalExpression "pkgs.gnome.adwaita-icon-theme";
-        description = lib.mdDoc ''
+        description = ''
           Package providing the icon theme. This package will be installed
           to your profile. If `null` then the theme
           is assumed to already be available in your profile.
@@ -62,8 +62,7 @@ let
       name = mkOption {
         type = types.str;
         example = "Adwaita";
-        description =
-          lib.mdDoc "The name of the icon theme within the package.";
+        description = "The name of the icon theme within the package.";
       };
     };
   };
@@ -74,7 +73,7 @@ let
         type = types.nullOr types.package;
         default = null;
         example = literalExpression "pkgs.vanilla-dmz";
-        description = lib.mdDoc ''
+        description = ''
           Package providing the cursor theme. This package will be installed
           to your profile. If `null` then the theme
           is assumed to already be available in your profile.
@@ -84,15 +83,14 @@ let
       name = mkOption {
         type = types.str;
         example = "Vanilla-DMZ";
-        description =
-          lib.mdDoc "The name of the cursor theme within the package.";
+        description = "The name of the cursor theme within the package.";
       };
 
       size = mkOption {
         type = types.nullOr types.int;
         default = null;
         example = 16;
-        description = lib.mdDoc ''
+        description = ''
           The size of the cursor.
         '';
       };
@@ -110,12 +108,12 @@ in {
 
   options = {
     gtk = {
-      enable = mkEnableOption (lib.mdDoc "GTK 2/3 configuration");
+      enable = mkEnableOption "GTK 2/3 configuration";
 
       font = mkOption {
         type = types.nullOr hm.types.fontType;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The font to use in GTK+ 2/3 applications.
         '';
       };
@@ -123,19 +121,19 @@ in {
       cursorTheme = mkOption {
         type = types.nullOr cursorThemeType;
         default = null;
-        description = lib.mdDoc "The cursor theme to use.";
+        description = "The cursor theme to use.";
       };
 
       iconTheme = mkOption {
         type = types.nullOr iconThemeType;
         default = null;
-        description = lib.mdDoc "The icon theme to use.";
+        description = "The icon theme to use.";
       };
 
       theme = mkOption {
         type = types.nullOr themeType;
         default = null;
-        description = lib.mdDoc "The GTK+2/3 theme to use.";
+        description = "The GTK+2/3 theme to use.";
       };
 
       gtk2 = {
@@ -143,7 +141,7 @@ in {
           type = types.lines;
           default = "";
           example = "gtk-can-change-accels = 1";
-          description = lib.mdDoc ''
+          description = ''
             Extra configuration lines to add verbatim to
             {file}`~/.gtkrc-2.0`.
           '';
@@ -156,7 +154,7 @@ in {
             literalExpression ''"''${config.home.homeDirectory}/.gtkrc-2.0"'';
           example =
             literalExpression ''"''${config.xdg.configHome}/gtk-2.0/gtkrc"'';
-          description = lib.mdDoc ''
+          description = ''
             The location to put the GTK configuration file.
           '';
         };
@@ -167,8 +165,7 @@ in {
           type = types.listOf types.str;
           default = [ ];
           example = [ "file:///home/jane/Documents" ];
-          description =
-            lib.mdDoc "Bookmarks in the sidebar of the GTK file browser";
+          description = "Bookmarks in the sidebar of the GTK file browser";
         };
 
         extraConfig = mkOption {
@@ -178,7 +175,7 @@ in {
             gtk-cursor-blink = false;
             gtk-recent-files-limit = 20;
           };
-          description = lib.mdDoc ''
+          description = ''
             Extra configuration options to add to
             {file}`$XDG_CONFIG_HOME/gtk-3.0/settings.ini`.
           '';
@@ -187,7 +184,7 @@ in {
         extraCss = mkOption {
           type = types.lines;
           default = "";
-          description = lib.mdDoc ''
+          description = ''
             Extra configuration lines to add verbatim to
             {file}`$XDG_CONFIG_HOME/gtk-3.0/gtk.css`.
           '';
@@ -202,7 +199,7 @@ in {
             gtk-cursor-blink = false;
             gtk-recent-files-limit = 20;
           };
-          description = lib.mdDoc ''
+          description = ''
             Extra configuration options to add to
             {file}`$XDG_CONFIG_HOME/gtk-4.0/settings.ini`.
           '';
@@ -211,7 +208,7 @@ in {
         extraCss = mkOption {
           type = types.lines;
           default = "";
-          description = lib.mdDoc ''
+          description = ''
             Extra configuration lines to add verbatim to
             {file}`$XDG_CONFIG_HOME/gtk-4.0/gtk.css`.
           '';
diff --git a/modules/misc/lib.nix b/modules/misc/lib.nix
index 5125091c4..13c00dc59 100644
--- a/modules/misc/lib.nix
+++ b/modules/misc/lib.nix
@@ -5,7 +5,7 @@
     lib = lib.mkOption {
       type = lib.types.attrsOf lib.types.attrs;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         This option allows modules to define helper functions,
         constants, etc.
       '';
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index 6dadb50b2..9248ee4fa 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -13,7 +13,7 @@ let
       id = mkOption {
         internal = true;
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           A unique entry identifier. By default it is a base16
           formatted hash of the entry message.
         '';
@@ -23,7 +23,7 @@ let
         internal = true;
         type = types.str;
         example = "2017-07-10T21:55:04+00:00";
-        description = lib.mdDoc ''
+        description = ''
           News entry time stamp in ISO-8601 format. Must be in UTC
           (ending in '+00:00').
         '';
@@ -32,13 +32,13 @@ let
       condition = mkOption {
         internal = true;
         default = true;
-        description = lib.mdDoc "Whether the news entry should be active.";
+        description = "Whether the news entry should be active.";
       };
 
       message = mkOption {
         internal = true;
         type = types.str;
-        description = lib.mdDoc "The news entry content.";
+        description = "The news entry content.";
       };
     };
 
@@ -57,7 +57,7 @@ in
       display = mkOption {
         type = types.enum [ "silent" "notify" "show" ];
         default = "notify";
-        description = lib.mdDoc ''
+        description = ''
           How unread and relevant news should be presented when
           running {command}`home-manager build` and
           {command}`home-manager switch`.
@@ -83,7 +83,7 @@ in
         internal = true;
         type = types.listOf entryModule;
         default = [ ];
-        description = lib.mdDoc "News entries.";
+        description = "News entries.";
       };
     };
   };
diff --git a/modules/misc/nix.nix b/modules/misc/nix.nix
index 9bb518f9b..9e2491436 100644
--- a/modules/misc/nix.nix
+++ b/modules/misc/nix.nix
@@ -82,9 +82,9 @@ let
 
 in {
   options.nix = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       the Nix configuration module
-    '') // {
+    '' // {
       default = true;
       visible = false;
     };
@@ -93,7 +93,7 @@ in {
       type = types.nullOr types.package;
       default = null;
       example = literalExpression "pkgs.nix";
-      description = lib.mdDoc ''
+      description = ''
         The Nix package that the configuration should be generated for.
       '';
     };
@@ -110,7 +110,7 @@ in {
               type = "indirect";
               id = "nixpkgs";
             };
-            description = lib.mdDoc "The flake reference to be rewritten.";
+            description = "The flake reference to be rewritten.";
           };
           to = mkOption {
             type = inputAttrs;
@@ -119,21 +119,21 @@ in {
               owner = "my-org";
               repo = "my-nixpkgs";
             };
-            description = lib.mdDoc
+            description =
               "The flake reference to which {option}`from>` is to be rewritten.";
           };
           flake = mkOption {
             type = types.nullOr types.attrs;
             default = null;
             example = literalExpression "nixpkgs";
-            description = lib.mdDoc ''
+            description = ''
               The flake input to which {option}`from>` is to be rewritten.
             '';
           };
           exact = mkOption {
             type = types.bool;
             default = true;
-            description = lib.mdDoc ''
+            description = ''
               Whether the {option}`from` reference needs to match exactly. If set,
               a {option}`from` reference like `nixpkgs` does not
               match with a reference like `nixpkgs/nixos-20.03`.
@@ -154,7 +154,7 @@ in {
         };
       }));
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         User level flake registry.
       '';
     };
@@ -163,13 +163,13 @@ in {
       type = types.int;
       default = 2;
       internal = true;
-      description = lib.mdDoc "The flake registry format version.";
+      description = "The flake registry format version.";
     };
 
     checkConfig = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         If enabled (the default), checks for data type mismatches and that Nix
         can parse the generated nix.conf.
       '';
@@ -182,7 +182,7 @@ in {
         keep-outputs = true
         keep-derivations = true
       '';
-      description = lib.mdDoc "Additional text appended to {file}`nix.conf`.";
+      description = "Additional text appended to {file}`nix.conf`.";
     };
 
     settings = mkOption {
@@ -195,7 +195,7 @@ in {
           system-features = [ "big-parallel" "kvm" "recursive-nix" ];
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration for Nix; see {manpage}`nix.conf(5)` for available options.
         The value declared here will be translated directly to the key-value pairs Nix expects.
 
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index b1767e551..efbbba96c 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -48,7 +48,7 @@ in {
       default = null;
       example = { allowBroken = true; };
       type = types.nullOr configType;
-      description = lib.mdDoc ''
+      description = ''
         The configuration of the Nix Packages collection. (For
         details, see the Nixpkgs documentation.) It allows you to set
         package configuration options.
@@ -86,7 +86,7 @@ in {
         ]
       '';
       type = types.nullOr (types.listOf overlayType);
-      description = lib.mdDoc ''
+      description = ''
         List of overlays to use with the Nix Packages collection. (For
         details, see the Nixpkgs documentation.) It allows you to
         override packages globally. This is a function that takes as
@@ -109,7 +109,7 @@ in {
       type = types.str;
       example = "i686-linux";
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         Specifies the Nix platform type for which the user environment
         should be built. If unset, it defaults to the platform type of
         your host system. Specifying this option is useful when doing
diff --git a/modules/misc/numlock.nix b/modules/misc/numlock.nix
index f2539262a..88032417f 100644
--- a/modules/misc/numlock.nix
+++ b/modules/misc/numlock.nix
@@ -9,9 +9,7 @@ let
 in {
   meta.maintainers = [ maintainers.evanjs ];
 
-  options = {
-    xsession.numlock.enable = mkEnableOption (lib.mdDoc "Num Lock");
-  };
+  options = { xsession.numlock.enable = mkEnableOption "Num Lock"; };
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/misc/pam.nix b/modules/misc/pam.nix
index 7e56274bd..22a5daf0d 100644
--- a/modules/misc/pam.nix
+++ b/modules/misc/pam.nix
@@ -14,7 +14,7 @@ in {
       default = { };
       type = types.attrs;
       example = { EDITOR = "vim"; };
-      description = lib.mdDoc ''
+      description = ''
         Environment variables that will be set for the PAM session.
         The variable values must be as described in
         {manpage}`pam_env.conf(5)`.
@@ -34,7 +34,7 @@ in {
             };
           in listOf yubiKeyId;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           List of authorized YubiKey token IDs. Refer to
           <https://developers.yubico.com/yubico-pam>
           for details on how to obtain the token ID of a YubiKey.
@@ -44,7 +44,7 @@ in {
       path = mkOption {
         type = types.str;
         default = ".yubico/authorized_yubikeys";
-        description = lib.mdDoc ''
+        description = ''
           File path to write the authorized YubiKeys,
           relative to {env}`HOME`.
         '';
diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix
index 3c0fe122a..554072e2f 100644
--- a/modules/misc/qt.nix
+++ b/modules/misc/qt.nix
@@ -41,7 +41,7 @@ in {
 
   options = {
     qt = {
-      enable = mkEnableOption (lib.mdDoc "Qt 4, 5 and 6 configuration");
+      enable = mkEnableOption "Qt 4, 5 and 6 configuration";
 
       platformTheme = mkOption {
         type = types.nullOr (types.enum [ "gtk" "gnome" "qtct" "kde" ]);
@@ -55,7 +55,7 @@ in {
           [ "libsForQt5" "plasma-integration" ]
           [ "libsForQt5" "systemsettings" ]
         ];
-        description = lib.mdDoc ''
+        description = ''
           Platform theme to use for Qt applications.
 
           The options are
@@ -92,7 +92,7 @@ in {
             [ "libsForQt5" "qtstyleplugin-kvantum" ]
             [ "qt6Packages" "qtstyleplugin-kvantum" ]
           ];
-          description = lib.mdDoc ''
+          description = ''
             Style to use for Qt5/Qt6 applications. Case-insensitive.
 
             Some examples are
@@ -119,7 +119,7 @@ in {
           type = with types; nullOr (either package (listOf package));
           default = null;
           example = literalExpression "pkgs.adwaita-qt";
-          description = lib.mdDoc ''
+          description = ''
             Theme package to be used in Qt5/Qt6 applications.
             Auto-detected from {option}`qt.style.name` if possible.
           '';
diff --git a/modules/misc/specialisation.nix b/modules/misc/specialisation.nix
index a16ded2fb..dc5f78e14 100644
--- a/modules/misc/specialisation.nix
+++ b/modules/misc/specialisation.nix
@@ -27,14 +27,14 @@ with lib;
           in extended.type;
           default = { };
           visible = "shallow";
-          description = lib.mdDoc ''
+          description = ''
             Arbitrary Home Manager configuration settings.
           '';
         };
       };
     });
     default = { };
-    description = lib.mdDoc ''
+    description = ''
       A set of named specialized configurations. These can be used to extend
       your base configuration with additional settings. For example, you can
       have specialisations named "light" and "dark"
diff --git a/modules/misc/submodule-support.nix b/modules/misc/submodule-support.nix
index b685f8dda..400e234cb 100644
--- a/modules/misc/submodule-support.nix
+++ b/modules/misc/submodule-support.nix
@@ -10,7 +10,7 @@ with lib;
       type = types.bool;
       default = false;
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether the Home Manager module system is used as a submodule
         in, for example, NixOS or nix-darwin.
       '';
@@ -20,7 +20,7 @@ with lib;
       type = types.bool;
       default = false;
       internal = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether the packages of {option}`home.packages` are
         installed separately from the Home Manager activation script.
         In NixOS, for example, this may be accomplished by installing
diff --git a/modules/misc/tmpfiles.nix b/modules/misc/tmpfiles.nix
index 735a79128..c5f4a9756 100644
--- a/modules/misc/tmpfiles.nix
+++ b/modules/misc/tmpfiles.nix
@@ -13,7 +13,7 @@ in {
     type = types.listOf types.str;
     default = [ ];
     example = [ "L /home/user/Documents - - - - /mnt/data/Documents" ];
-    description = lib.mdDoc ''
+    description = ''
       Rules for creating and cleaning up temporary files
       automatically. See
       {manpage}`tmpfiles.d(5)`
diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index d6170eaea..f82fc3a42 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -21,7 +21,7 @@ in {
         "23.05"
         "23.11"
       ];
-      description = lib.mdDoc ''
+      description = ''
         It is occasionally necessary for Home Manager to change
         configuration defaults in a way that is incompatible with
         stateful data. This could, for example, include switching the
@@ -46,7 +46,7 @@ in {
             optionalString (revision != null) "+${substring 0 8 revision}";
         in "${release}${suffix}";
         example = "22.11+213a0629";
-        description = lib.mdDoc "The full Home Manager version.";
+        description = "The full Home Manager version.";
       };
 
       release = mkOption {
@@ -55,7 +55,7 @@ in {
         type = types.str;
         default = releaseInfo.release;
         example = "22.11";
-        description = lib.mdDoc "The Home Manager release.";
+        description = "The Home Manager release.";
       };
 
       isReleaseBranch = mkOption {
@@ -63,7 +63,7 @@ in {
         readOnly = true;
         type = types.bool;
         default = releaseInfo.isReleaseBranch;
-        description = lib.mdDoc ''
+        description = ''
           Whether the Home Manager version is from a versioned
           release branch.
         '';
@@ -74,7 +74,7 @@ in {
         type = types.nullOr types.str;
         default = let gitRepo = "${toString ./../..}/.git";
         in if pathIsGitRepo gitRepo then commitIdFromGitRepo gitRepo else null;
-        description = lib.mdDoc ''
+        description = ''
           The Git revision from which this Home Manager configuration was built.
         '';
       };
diff --git a/modules/misc/vte.nix b/modules/misc/vte.nix
index 0d828fb71..fbe38c016 100644
--- a/modules/misc/vte.nix
+++ b/modules/misc/vte.nix
@@ -6,19 +6,15 @@ with lib;
   meta.maintainers = [ maintainers.rycee ];
 
   options.programs = let
-    description = lib.mdDoc ''
+    description = ''
       Whether to enable integration with terminals using the VTE
       library. This will let the terminal track the current working
       directory.
     '';
   in {
-    bash.enableVteIntegration = mkEnableOption (lib.mdDoc "") // {
-      inherit description;
-    };
+    bash.enableVteIntegration = mkEnableOption "" // { inherit description; };
 
-    zsh.enableVteIntegration = mkEnableOption (lib.mdDoc "") // {
-      inherit description;
-    };
+    zsh.enableVteIntegration = mkEnableOption "" // { inherit description; };
   };
 
   config = mkMerge [
diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix
index 6c01dad24..a810796f1 100644
--- a/modules/misc/xdg-desktop-entries.nix
+++ b/modules/misc/xdg-desktop-entries.nix
@@ -26,63 +26,61 @@ let
       # https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys
 
       type = mkOption {
-        description = lib.mdDoc "The type of the desktop entry.";
+        description = "The type of the desktop entry.";
         default = "Application";
         type = types.enum [ "Application" "Link" "Directory" ];
       };
 
       exec = mkOption {
-        description = lib.mdDoc "Program to execute, possibly with arguments.";
+        description = "Program to execute, possibly with arguments.";
         type = types.nullOr types.str;
         default = null;
       };
 
       icon = mkOption {
-        description = lib.mdDoc "Icon to display in file manager, menus, etc.";
+        description = "Icon to display in file manager, menus, etc.";
         type = with types; nullOr (either str path);
         default = null;
       };
 
       comment = mkOption {
-        description = lib.mdDoc "Tooltip for the entry.";
+        description = "Tooltip for the entry.";
         type = types.nullOr types.str;
         default = null;
       };
 
       terminal = mkOption {
-        description =
-          lib.mdDoc "Whether the program runs in a terminal window.";
+        description = "Whether the program runs in a terminal window.";
         type = types.bool;
         default = false;
       };
 
       name = mkOption {
-        description = lib.mdDoc "Specific name of the application.";
+        description = "Specific name of the application.";
         type = types.str;
       };
 
       genericName = mkOption {
-        description = lib.mdDoc "Generic name of the application.";
+        description = "Generic name of the application.";
         type = types.nullOr types.str;
         default = null;
       };
 
       mimeType = mkOption {
-        description =
-          lib.mdDoc "The MIME type(s) supported by this application.";
+        description = "The MIME type(s) supported by this application.";
         type = types.nullOr (types.listOf types.str);
         default = null;
       };
 
       categories = mkOption {
         description =
-          lib.mdDoc "Categories in which the entry should be shown in a menu.";
+          "Categories in which the entry should be shown in a menu.";
         type = types.nullOr (types.listOf types.str);
         default = null;
       };
 
       startupNotify = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           If true, it is KNOWN that the application will send a "remove"
           message when started with the `DESKTOP_STARTUP_ID`
           environment variable set. If false, it is KNOWN that the application
@@ -92,7 +90,7 @@ let
       };
 
       noDisplay = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Means "this application exists, but don't display it in the menus".
           This can be useful to e.g. associate this application with MIME types.
         '';
@@ -101,7 +99,7 @@ let
       };
 
       prefersNonDefaultGPU = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           If true, the application prefers to be run on a more powerful discrete GPU if available.
         '';
         type = types.nullOr types.bool;
@@ -110,7 +108,7 @@ let
 
       settings = mkOption {
         type = types.attrsOf types.string;
-        description = lib.mdDoc ''
+        description = ''
           Extra key-value pairs to add to the `[Desktop Entry]` section.
           This may override other values.
         '';
@@ -129,19 +127,17 @@ let
             type = types.str;
             default = name;
             defaultText = literalExpression "<name>";
-            description = lib.mdDoc "Name of the action.";
+            description = "Name of the action.";
           };
           options.exec = mkOption {
             type = types.nullOr types.str;
-            description =
-              lib.mdDoc "Program to execute, possibly with arguments.";
+            description = "Program to execute, possibly with arguments.";
             default = null;
           };
           options.icon = mkOption {
             type = with types; nullOr (either str path);
             default = null;
-            description =
-              lib.mdDoc "Icon to display in file manager, menus, etc.";
+            description = "Icon to display in file manager, menus, etc.";
           };
         }));
         default = { };
@@ -153,7 +149,7 @@ let
             };
           }
         '';
-        description = lib.mdDoc
+        description =
           "The set of actions made available to application launchers.";
       };
 
@@ -184,7 +180,7 @@ in {
   meta.maintainers = [ hm.maintainers.cwyc ];
 
   options.xdg.desktopEntries = mkOption {
-    description = lib.mdDoc ''
+    description = ''
       Desktop Entries allow applications to be shown in your desktop environment's app launcher.
 
       You can define entries for programs without entries or override existing entries.
diff --git a/modules/misc/xdg-mime-apps.nix b/modules/misc/xdg-mime-apps.nix
index 1b21f9b9b..c9fd3e8be 100644
--- a/modules/misc/xdg-mime-apps.nix
+++ b/modules/misc/xdg-mime-apps.nix
@@ -16,7 +16,7 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to manage {file}`$XDG_CONFIG_HOME/mimeapps.list`.
 
         The generated file is read-only.
@@ -35,7 +35,7 @@ in {
           "mimetype2" = "foo4.desktop";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Defines additional associations of applications with
         mimetypes, as if the .desktop file was listing this mimetype
         in the first place.
@@ -46,7 +46,7 @@ in {
       type = types.attrsOf strListOrSingleton;
       default = { };
       example = { "mimetype1" = "foo5.desktop"; };
-      description = lib.mdDoc ''
+      description = ''
         Removes associations of applications with mimetypes, as if the
         .desktop file was *not* listing this
         mimetype in the first place.
@@ -61,7 +61,7 @@ in {
           "mimetype1" = [ "default1.desktop" "default2.desktop" ];
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         The default application to be used for a given mimetype. This
         is, for instance, the one that will be started when
         double-clicking on a file in a file manager. If the
diff --git a/modules/misc/xdg-mime.nix b/modules/misc/xdg-mime.nix
index ef36e709d..09f62aaff 100644
--- a/modules/misc/xdg-mime.nix
+++ b/modules/misc/xdg-mime.nix
@@ -13,7 +13,7 @@ in {
       default = pkgs.stdenv.hostPlatform.isLinux;
       defaultText =
         literalExpression "true if host platform is Linux, false otherwise";
-      description = lib.mdDoc ''
+      description = ''
         Whether to install programs and files to support the
         XDG Shared MIME-info specification and XDG MIME Applications
         specification at
diff --git a/modules/misc/xdg-system-dirs.nix b/modules/misc/xdg-system-dirs.nix
index 5d6c78bfa..0be5e26d2 100644
--- a/modules/misc/xdg-system-dirs.nix
+++ b/modules/misc/xdg-system-dirs.nix
@@ -18,7 +18,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = literalExpression ''[ "/etc/xdg" ]'';
-      description = lib.mdDoc ''
+      description = ''
         Directory names to add to {env}`XDG_CONFIG_DIRS`
         in the user session.
       '';
@@ -28,7 +28,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = literalExpression ''[ "/usr/share" "/usr/local/share" ]'';
-      description = lib.mdDoc ''
+      description = ''
         Directory names to add to {env}`XDG_DATA_DIRS`
         in the user session.
       '';
diff --git a/modules/misc/xdg-user-dirs.nix b/modules/misc/xdg-user-dirs.nix
index f435bdaf8..fcc0742cd 100644
--- a/modules/misc/xdg-user-dirs.nix
+++ b/modules/misc/xdg-user-dirs.nix
@@ -21,7 +21,7 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to manage {file}`$XDG_CONFIG_HOME/user-dirs.dirs`.
 
         The generated file is read-only.
@@ -36,7 +36,7 @@ in {
       default = "${config.home.homeDirectory}/Desktop";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Desktop"'';
-      description = lib.mdDoc "The Desktop directory.";
+      description = "The Desktop directory.";
     };
 
     documents = mkOption {
@@ -44,7 +44,7 @@ in {
       default = "${config.home.homeDirectory}/Documents";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Documents"'';
-      description = lib.mdDoc "The Documents directory.";
+      description = "The Documents directory.";
     };
 
     download = mkOption {
@@ -52,7 +52,7 @@ in {
       default = "${config.home.homeDirectory}/Downloads";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Downloads"'';
-      description = lib.mdDoc "The Downloads directory.";
+      description = "The Downloads directory.";
     };
 
     music = mkOption {
@@ -60,7 +60,7 @@ in {
       default = "${config.home.homeDirectory}/Music";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Music"'';
-      description = lib.mdDoc "The Music directory.";
+      description = "The Music directory.";
     };
 
     pictures = mkOption {
@@ -68,7 +68,7 @@ in {
       default = "${config.home.homeDirectory}/Pictures";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Pictures"'';
-      description = lib.mdDoc "The Pictures directory.";
+      description = "The Pictures directory.";
     };
 
     publicShare = mkOption {
@@ -76,7 +76,7 @@ in {
       default = "${config.home.homeDirectory}/Public";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Public"'';
-      description = lib.mdDoc "The Public share directory.";
+      description = "The Public share directory.";
     };
 
     templates = mkOption {
@@ -84,7 +84,7 @@ in {
       default = "${config.home.homeDirectory}/Templates";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Templates"'';
-      description = lib.mdDoc "The Templates directory.";
+      description = "The Templates directory.";
     };
 
     videos = mkOption {
@@ -92,7 +92,7 @@ in {
       default = "${config.home.homeDirectory}/Videos";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/Videos"'';
-      description = lib.mdDoc "The Videos directory.";
+      description = "The Videos directory.";
     };
 
     extraConfig = mkOption {
@@ -104,11 +104,11 @@ in {
           XDG_MISC_DIR = "''${config.home.homeDirectory}/Misc";
         }
       '';
-      description = lib.mdDoc "Other user directories.";
+      description = "Other user directories.";
     };
 
-    createDirectories = mkEnableOption
-      (lib.mdDoc "automatic creation of the XDG user directories");
+    createDirectories =
+      mkEnableOption "automatic creation of the XDG user directories";
   };
 
   config = let
diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index d2ffc36f2..23cbe72a2 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -22,13 +22,13 @@ let
 
 in {
   options.xdg = {
-    enable = mkEnableOption (lib.mdDoc "management of XDG base directories");
+    enable = mkEnableOption "management of XDG base directories";
 
     cacheHome = mkOption {
       type = types.path;
       defaultText = "~/.cache";
       apply = toString;
-      description = lib.mdDoc ''
+      description = ''
         Absolute path to directory holding application caches.
       '';
     };
@@ -36,7 +36,7 @@ in {
     configFile = mkOption {
       type = fileType "xdg.configFile" "{var}`xdg.configHome`" cfg.configHome;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of files to link into the user's XDG
         configuration home.
       '';
@@ -46,7 +46,7 @@ in {
       type = types.path;
       defaultText = "~/.config";
       apply = toString;
-      description = lib.mdDoc ''
+      description = ''
         Absolute path to directory holding application configurations.
       '';
     };
@@ -55,7 +55,7 @@ in {
       type =
         fileType "xdg.dataFile" "<varname>xdg.dataHome</varname>" cfg.dataHome;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of files to link into the user's XDG
         data home.
       '';
@@ -65,7 +65,7 @@ in {
       type = types.path;
       defaultText = "~/.local/share";
       apply = toString;
-      description = lib.mdDoc ''
+      description = ''
         Absolute path to directory holding application data.
       '';
     };
@@ -74,7 +74,7 @@ in {
       type = types.path;
       defaultText = "~/.local/state";
       apply = toString;
-      description = lib.mdDoc ''
+      description = ''
         Absolute path to directory holding application states.
       '';
     };
diff --git a/modules/misc/xfconf.nix b/modules/misc/xfconf.nix
index c82f05e9d..ec0cd82d0 100644
--- a/modules/misc/xfconf.nix
+++ b/modules/misc/xfconf.nix
@@ -10,7 +10,7 @@ let
     options = {
       type = mkOption {
         type = types.enum [ "int" "uint" "uint64" ];
-        description = lib.mdDoc ''
+        description = ''
           To distinguish between int, uint and uint64 in xfconf,
           you can specify the type in xfconf with this submodule.
           For other types, you don't need to use this submodule,
@@ -19,7 +19,7 @@ let
       };
       value = mkOption {
         type = types.int;
-        description = lib.mdDoc "The value in xfconf.";
+        description = "The value in xfconf.";
       };
     };
   };
@@ -63,7 +63,7 @@ in {
       type = types.bool;
       default = true;
       visible = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Xfconf settings.
 
         Note, if you use NixOS then you must add
@@ -93,7 +93,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Settings to write to the Xfconf configuration system.
       '';
     };
diff --git a/modules/programs/abook.nix b/modules/programs/abook.nix
index 8276cd36c..a9945d0e7 100644
--- a/modules/programs/abook.nix
+++ b/modules/programs/abook.nix
@@ -8,7 +8,7 @@ let
 
 in {
   options.programs.abook = {
-    enable = mkEnableOption (lib.mdDoc "Abook");
+    enable = mkEnableOption "Abook";
 
     extraConfig = mkOption {
       type = types.lines;
@@ -18,7 +18,7 @@ in {
         view CONTACT = name, email
         set autosave=true
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to {file}`$HOME/.config/abook/abookrc`.
         Available configuration options are described in the abook repository:
         <https://sourceforge.net/p/abook/git/ci/master/tree/sample.abookrc>.
diff --git a/modules/programs/aerc-accounts.nix b/modules/programs/aerc-accounts.nix
index 40bd18a18..a40877f54 100644
--- a/modules/programs/aerc-accounts.nix
+++ b/modules/programs/aerc-accounts.nix
@@ -18,28 +18,28 @@ let
           token_endpoint = mkOption {
             type = nullOr str;
             default = null;
-            description = lib.mdDoc "The OAuth2 token endpoint.";
+            description = "The OAuth2 token endpoint.";
           };
           client_id = mkOption {
             type = nullOr str;
             default = null;
-            description = lib.mdDoc "The OAuth2 client identifier.";
+            description = "The OAuth2 client identifier.";
           };
           client_secret = mkOption {
             type = nullOr str;
             default = null;
-            description = lib.mdDoc "The OAuth2 client secret.";
+            description = "The OAuth2 client secret.";
           };
           scope = mkOption {
             type = nullOr str;
             default = null;
-            description = lib.mdDoc "The OAuth2 requested scope.";
+            description = "The OAuth2 requested scope.";
           };
         };
       });
     default = null;
     example = { token_endpoint = "<token_endpoint>"; };
-    description = lib.mdDoc ''
+    description = ''
       Sets the oauth2 params if authentication mechanism oauthbearer or
       xoauth2 is used.
       See {manpage}`aerc-imap(5)`.
@@ -50,13 +50,13 @@ in {
   type = mkOption {
     type = types.attrsOf (types.submodule {
       options.aerc = {
-        enable = mkEnableOption (lib.mdDoc "aerc");
+        enable = mkEnableOption "aerc";
         extraAccounts = mkOption {
           type = confSection;
           default = { };
           example =
             literalExpression ''{ source = "maildir://~/Maildir/example"; }'';
-          description = lib.mdDoc ''
+          description = ''
             Extra config added to the configuration section for this account in
             {file}`$HOME/.config/aerc/accounts.conf`.
             See {manpage}`aerc-accounts(5)`.
@@ -68,7 +68,7 @@ in {
           default = { };
           example = literalExpression
             ''{ messages = { d = ":move ''${folder.trash}<Enter>"; }; }'';
-          description = lib.mdDoc ''
+          description = ''
             Extra bindings specific to this account, added to
             {file}`$HOME/.config/aerc/binds.conf`.
             See {manpage}`aerc-binds(5)`.
@@ -79,7 +79,7 @@ in {
           type = confSections;
           default = { };
           example = literalExpression "{ ui = { sidebar-width = 25; }; }";
-          description = lib.mdDoc ''
+          description = ''
             Config specific to this account, added to {file}`$HOME/.config/aerc/aerc.conf`.
             Aerc only supports per-account UI configuration.
             For other sections of {file}`$HOME/.config/aerc/aerc.conf`,
@@ -92,7 +92,7 @@ in {
           type = with types; nullOr (enum [ "oauthbearer" "xoauth2" ]);
           default = null;
           example = "auth";
-          description = lib.mdDoc ''
+          description = ''
             Sets the authentication mechanism if imap is used as the incoming
             method.
             See {manpage}`aerc-imap(5)`.
@@ -106,7 +106,7 @@ in {
             nullOr (enum [ "none" "plain" "login" "oauthbearer" "xoauth2" ]);
           default = "plain";
           example = "auth";
-          description = lib.mdDoc ''
+          description = ''
             Sets the authentication mechanism if smtp is used as the outgoing
             method.
             See {manpage}`aerc-smtp(5)`.
diff --git a/modules/programs/aerc.nix b/modules/programs/aerc.nix
index 81110a140..662ab5b18 100644
--- a/modules/programs/aerc.nix
+++ b/modules/programs/aerc.nix
@@ -31,16 +31,16 @@ in {
 
   options.programs.aerc = {
 
-    enable = mkEnableOption (lib.mdDoc "aerc");
+    enable = mkEnableOption "aerc";
 
-    package = mkPackageOptionMD pkgs "aerc" { };
+    package = mkPackageOption pkgs "aerc" { };
 
     extraAccounts = mkOption {
       type = sectionsOrLines;
       default = { };
       example = literalExpression
         ''{ Work = { source = "maildir://~/Maildir/work"; }; }'';
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to {file}`$HOME/.config/aerc/accounts.conf`.
 
         See {manpage}`aerc-config(5)`.
@@ -51,7 +51,7 @@ in {
       type = sectionsOrLines;
       default = { };
       example = literalExpression ''{ messages = { q = ":quit<Enter>"; }; }'';
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to {file}`$HOME/.config/aerc/binds.conf`.
         Global keybindings can be set in the `global` section.
 
@@ -63,7 +63,7 @@ in {
       type = sectionsOrLines;
       default = { };
       example = literalExpression ''{ ui = { sort = "-r date"; }; }'';
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to {file}`$HOME/.config/aerc/aerc.conf`.
 
         See {manpage}`aerc-config(5)`.
@@ -76,7 +76,7 @@ in {
       example = literalExpression ''
         { default = { ui = { "tab.selected.reverse" = toggle; }; }; };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Stylesets added to {file}`$HOME/.config/aerc/stylesets/`.
 
         See {manpage}`aerc-stylesets(7)`.
@@ -89,7 +89,7 @@ in {
       example = literalExpression ''
         { new_message = "Hello!"; };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Templates added to {file}`$HOME/.config/aerc/templates/`.
 
         See {manpage}`aerc-templates(7)`.
diff --git a/modules/programs/afew.nix b/modules/programs/afew.nix
index 9c6048894..e0bb26046 100644
--- a/modules/programs/afew.nix
+++ b/modules/programs/afew.nix
@@ -8,8 +8,7 @@ let
 
 in {
   options.programs.afew = {
-    enable =
-      mkEnableOption (lib.mdDoc "the afew initial tagging script for Notmuch");
+    enable = mkEnableOption "the afew initial tagging script for Notmuch";
 
     extraConfig = mkOption {
       type = types.lines;
@@ -30,7 +29,7 @@ in {
 
         [InboxFilter]
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to afew configuration file. Available
         configuration options are described in the afew manual:
         <https://afew.readthedocs.io/en/latest/configuration.html>.
diff --git a/modules/programs/alacritty.nix b/modules/programs/alacritty.nix
index f52f63a6e..56beb6d48 100644
--- a/modules/programs/alacritty.nix
+++ b/modules/programs/alacritty.nix
@@ -8,13 +8,13 @@ let
 in {
   options = {
     programs.alacritty = {
-      enable = mkEnableOption (lib.mdDoc "Alacritty");
+      enable = mkEnableOption "Alacritty";
 
       package = mkOption {
         type = types.package;
         default = pkgs.alacritty;
         defaultText = literalExpression "pkgs.alacritty";
-        description = lib.mdDoc "The Alacritty package to install.";
+        description = "The Alacritty package to install.";
       };
 
       settings = mkOption {
@@ -35,7 +35,7 @@ in {
             ];
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/alacritty/alacritty.yml`. See
           <https://github.com/alacritty/alacritty/blob/master/alacritty.yml>
diff --git a/modules/programs/alot-accounts.nix b/modules/programs/alot-accounts.nix
index 6cfce4a8f..0a51bfde5 100644
--- a/modules/programs/alot-accounts.nix
+++ b/modules/programs/alot-accounts.nix
@@ -7,7 +7,7 @@ with lib;
   options.alot = {
     sendMailCommand = mkOption {
       type = types.nullOr types.str;
-      description = lib.mdDoc ''
+      description = ''
         Command to send a mail. If msmtp is enabled for the account,
         then this is set to
         {command}`msmtpq --read-envelope-from --read-recipients`.
@@ -33,7 +33,7 @@ with lib;
           ignorecase = "True";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Contact completion configuration as expected per alot.
         See [alot's wiki](http://alot.readthedocs.io/en/latest/configuration/contacts_completion.html) for
         explanation about possible values.
@@ -43,7 +43,7 @@ with lib;
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra settings to add to this Alot account configuration.
       '';
     };
diff --git a/modules/programs/alot.nix b/modules/programs/alot.nix
index c86f72227..d0f552f92 100644
--- a/modules/programs/alot.nix
+++ b/modules/programs/alot.nix
@@ -25,7 +25,7 @@ let
     options = {
       translated = mkOption {
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Fixed string representation for this tag. The tag can be
           hidden from view, if the key translated is set to
           `""`, the empty string.
@@ -35,7 +35,7 @@ let
       translation = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           A pair of strings that define a regular substitution to
           compute the string representation on the fly using
           `re.sub`.
@@ -46,7 +46,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "'','', 'white','light red', 'white','#d66'";
-        description = lib.mdDoc ''
+        description = ''
           How to display the tag when unfocused.
           See <https://alot.readthedocs.io/en/latest/configuration/theming.html#tagstring-formatting>.
         '';
@@ -55,7 +55,7 @@ let
       focus = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "How to display the tag when focused.";
+        description = "How to display the tag when focused.";
       };
     };
   };
@@ -125,7 +125,7 @@ in {
         type = types.bool;
         default = false;
         example = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable the Alot mail user agent. Alot uses the
           Notmuch email system and will therefore be automatically
           enabled for each email account that is managed by Notmuch.
@@ -135,7 +135,7 @@ in {
       hooks = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Content of the hooks file.
         '';
       };
@@ -146,42 +146,42 @@ in {
             global = mkOption {
               type = types.attrsOf types.str;
               default = { };
-              description = lib.mdDoc "Global keybindings.";
+              description = "Global keybindings.";
             };
 
             bufferlist = mkOption {
               type = types.attrsOf types.str;
               default = { };
-              description = lib.mdDoc "Bufferlist mode keybindings.";
+              description = "Bufferlist mode keybindings.";
             };
 
             search = mkOption {
               type = types.attrsOf types.str;
               default = { };
-              description = lib.mdDoc "Search mode keybindings.";
+              description = "Search mode keybindings.";
             };
 
             envelope = mkOption {
               type = types.attrsOf types.str;
               default = { };
-              description = lib.mdDoc "Envelope mode keybindings.";
+              description = "Envelope mode keybindings.";
             };
 
             taglist = mkOption {
               type = types.attrsOf types.str;
               default = { };
-              description = lib.mdDoc "Taglist mode keybindings.";
+              description = "Taglist mode keybindings.";
             };
 
             thread = mkOption {
               type = types.attrsOf types.str;
               default = { };
-              description = lib.mdDoc "Thread mode keybindings.";
+              description = "Thread mode keybindings.";
             };
           };
         };
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Keybindings.
         '';
       };
@@ -189,7 +189,7 @@ in {
       tags = mkOption {
         type = types.attrsOf tagSubmodule;
         default = { };
-        description = lib.mdDoc "How to display the tags.";
+        description = "How to display the tags.";
       };
 
       settings = mkOption {
@@ -209,7 +209,7 @@ in {
             thread_indent_replies = 2;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration options added to alot configuration file.
         '';
       };
@@ -217,7 +217,7 @@ in {
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra lines added to alot configuration file.
         '';
       };
diff --git a/modules/programs/antidote.nix b/modules/programs/antidote.nix
index e5c769cf5..f1fa044ce 100644
--- a/modules/programs/antidote.nix
+++ b/modules/programs/antidote.nix
@@ -19,18 +19,18 @@ in {
   meta.maintainers = [ maintainers.hitsmaxft ];
 
   options.programs.zsh.antidote = {
-    enable = mkEnableOption (lib.mdDoc "antidote - a zsh plugin manager");
+    enable = mkEnableOption "antidote - a zsh plugin manager";
 
     plugins = mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [ "zsh-users/zsh-autosuggestions" ];
-      description = lib.mdDoc "List of antidote plugins.";
+      description = "List of antidote plugins.";
     };
 
-    useFriendlyNames = mkEnableOption (lib.mdDoc "friendly names");
+    useFriendlyNames = mkEnableOption "friendly names";
 
-    package = mkPackageOptionMD pkgs "antidote" { };
+    package = mkPackageOption pkgs "antidote" { };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/aria2.nix b/modules/programs/aria2.nix
index c26e09dbb..549e6baf4 100644
--- a/modules/programs/aria2.nix
+++ b/modules/programs/aria2.nix
@@ -17,12 +17,12 @@ in {
   meta.maintainers = [ hm.maintainers.justinlovinger ];
 
   options.programs.aria2 = {
-    enable = mkEnableOption (lib.mdDoc "aria2");
+    enable = mkEnableOption "aria2";
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool float int str ]);
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Options to add to {file}`aria2.conf` file.
         See
         {manpage}`aria2c(1)`
@@ -42,7 +42,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to {file}`aria2.conf` file.
       '';
     };
diff --git a/modules/programs/astroid-accounts.nix b/modules/programs/astroid-accounts.nix
index 49711c517..b9b1fac02 100644
--- a/modules/programs/astroid-accounts.nix
+++ b/modules/programs/astroid-accounts.nix
@@ -4,11 +4,11 @@ with lib;
 
 {
   options.astroid = {
-    enable = mkEnableOption (lib.mdDoc "Astroid");
+    enable = mkEnableOption "Astroid";
 
     sendMailCommand = mkOption {
       type = types.str;
-      description = lib.mdDoc ''
+      description = ''
         Command to send a mail. If msmtp is enabled for the account,
         then this is set to
         {command}`msmtpq --read-envelope-from --read-recipients`.
@@ -19,7 +19,7 @@ with lib;
       type = types.attrsOf types.anything;
       default = { };
       example = { select_query = ""; };
-      description = lib.mdDoc ''
+      description = ''
         Extra settings to add to this astroid account configuration.
       '';
     };
diff --git a/modules/programs/astroid.nix b/modules/programs/astroid.nix
index 7bc0e252e..911ce491b 100644
--- a/modules/programs/astroid.nix
+++ b/modules/programs/astroid.nix
@@ -55,13 +55,13 @@ let
 in {
   options = {
     programs.astroid = {
-      enable = mkEnableOption (lib.mdDoc "Astroid");
+      enable = mkEnableOption "Astroid";
 
       pollScript = mkOption {
         type = types.str;
         default = "";
         example = "mbsync gmail";
-        description = lib.mdDoc ''
+        description = ''
           Script to run to fetch/update mails.
         '';
       };
@@ -79,7 +79,7 @@ in {
           };
         example =
           "nvim-qt -- -c 'set ft=mail' '+set fileencoding=utf-8' '+set ff=unix' '+set enc=utf-8' '+set fo+=w' %1";
-        description = lib.mdDoc ''
+        description = ''
           You can use the following variables:
 
           `%1`
@@ -104,7 +104,7 @@ in {
             poll.interval = 0;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           JSON config that will override the default Astroid configuration.
         '';
       };
diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index 2f84e616a..bd907ac03 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -12,19 +12,19 @@ in {
   meta.maintainers = [ maintainers.hawkw ];
 
   options.programs.atuin = {
-    enable = mkEnableOption (lib.mdDoc "atuin");
+    enable = mkEnableOption "atuin";
 
     package = mkOption {
       type = types.package;
       default = pkgs.atuin;
       defaultText = literalExpression "pkgs.atuin";
-      description = lib.mdDoc "The package to use for atuin.";
+      description = "The package to use for atuin.";
     };
 
     enableBashIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Atuin's Bash integration. This will bind
         `ctrl-r` to open the Atuin history.
       '';
@@ -33,7 +33,7 @@ in {
     enableZshIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Atuin's Zsh integration.
 
         If enabled, this will bind `ctrl-r` and the up-arrow
@@ -44,7 +44,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Atuin's Fish integration.
 
         If enabled, this will bind the up-arrow key to open the Atuin history.
@@ -55,7 +55,7 @@ in {
       default = [ ];
       type = types.listOf types.str;
       example = [ "--disable-up-arrow" "--disable-ctrl-r" ];
-      description = lib.mdDoc ''
+      description = ''
         Flags to append to the shell hook.
       '';
     };
@@ -78,7 +78,7 @@ in {
           search_mode = "prefix";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/atuin/config.toml`.
 
@@ -90,7 +90,7 @@ in {
     enableNushellIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Nushell integration.
       '';
     };
diff --git a/modules/programs/autojump.nix b/modules/programs/autojump.nix
index 74e067630..e8bf6b437 100644
--- a/modules/programs/autojump.nix
+++ b/modules/programs/autojump.nix
@@ -11,12 +11,12 @@ in {
   meta.maintainers = [ maintainers.evanjs ];
 
   options.programs.autojump = {
-    enable = mkEnableOption (lib.mdDoc "autojump");
+    enable = mkEnableOption "autojump";
 
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -24,7 +24,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -32,7 +32,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/autorandr.nix b/modules/programs/autorandr.nix
index 8dfa16ce9..edbe83de6 100644
--- a/modules/programs/autorandr.nix
+++ b/modules/programs/autorandr.nix
@@ -26,7 +26,7 @@ let
     options = {
       fingerprint = mkOption {
         type = types.attrsOf types.str;
-        description = lib.mdDoc ''
+        description = ''
           Output name to EDID mapping.
           Use `autorandr --fingerprint` to get current setup values.
         '';
@@ -35,13 +35,13 @@ let
 
       config = mkOption {
         type = types.attrsOf configModule;
-        description = lib.mdDoc "Per output profile configuration.";
+        description = "Per output profile configuration.";
         default = { };
       };
 
       hooks = mkOption {
         type = profileHooksModule;
-        description = lib.mdDoc "Profile hook scripts.";
+        description = "Profile hook scripts.";
         default = { };
       };
     };
@@ -51,54 +51,54 @@ let
     options = {
       enable = mkOption {
         type = types.bool;
-        description = lib.mdDoc "Whether to enable the output.";
+        description = "Whether to enable the output.";
         default = true;
       };
 
       crtc = mkOption {
         type = types.nullOr types.ints.unsigned;
-        description = lib.mdDoc "Output video display controller.";
+        description = "Output video display controller.";
         default = null;
         example = 0;
       };
 
       primary = mkOption {
         type = types.bool;
-        description = lib.mdDoc "Whether output should be marked as primary";
+        description = "Whether output should be marked as primary";
         default = false;
       };
 
       position = mkOption {
         type = types.str;
-        description = lib.mdDoc "Output position";
+        description = "Output position";
         default = "";
         example = "5760x0";
       };
 
       mode = mkOption {
         type = types.str;
-        description = lib.mdDoc "Output resolution.";
+        description = "Output resolution.";
         default = "";
         example = "3840x2160";
       };
 
       rate = mkOption {
         type = types.str;
-        description = lib.mdDoc "Output framerate.";
+        description = "Output framerate.";
         default = "";
         example = "60.00";
       };
 
       gamma = mkOption {
         type = types.str;
-        description = lib.mdDoc "Output gamma configuration.";
+        description = "Output gamma configuration.";
         default = "";
         example = "1.0:0.909:0.833";
       };
 
       rotate = mkOption {
         type = types.nullOr (types.enum [ "normal" "left" "right" "inverted" ]);
-        description = lib.mdDoc "Output rotate configuration.";
+        description = "Output rotate configuration.";
         default = null;
         example = "left";
       };
@@ -113,7 +113,7 @@ let
             [ 0.0 0.0 1.0 ]
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           Refer to
           {manpage}`xrandr(1)`
           for the documentation of the transform matrix.
@@ -122,7 +122,7 @@ let
 
       dpi = mkOption {
         type = types.nullOr types.ints.positive;
-        description = lib.mdDoc "Output DPI configuration.";
+        description = "Output DPI configuration.";
         default = null;
         example = 96;
       };
@@ -132,23 +132,23 @@ let
           options = {
             method = mkOption {
               type = types.enum [ "factor" "pixel" ];
-              description = lib.mdDoc "Output scaling method.";
+              description = "Output scaling method.";
               default = "factor";
               example = "pixel";
             };
 
             x = mkOption {
               type = types.either types.float types.ints.positive;
-              description = lib.mdDoc "Horizontal scaling factor/pixels.";
+              description = "Horizontal scaling factor/pixels.";
             };
 
             y = mkOption {
               type = types.either types.float types.ints.positive;
-              description = lib.mdDoc "Vertical scaling factor/pixels.";
+              description = "Vertical scaling factor/pixels.";
             };
           };
         });
-        description = lib.mdDoc ''
+        description = ''
           Output scale configuration.
 
           Either configure by pixels or a scaling factor. When using pixel method the
@@ -173,8 +173,7 @@ let
 
       filter = mkOption {
         type = types.nullOr (types.enum [ "bilinear" "nearest" ]);
-        description =
-          lib.mdDoc "Interpolation method to be used for scaling the output.";
+        description = "Interpolation method to be used for scaling the output.";
         default = null;
         example = "nearest";
       };
@@ -187,19 +186,19 @@ let
     options = {
       postswitch = mkOption {
         type = types.attrsOf hookType;
-        description = lib.mdDoc "Postswitch hook executed after mode switch.";
+        description = "Postswitch hook executed after mode switch.";
         default = { };
       };
 
       preswitch = mkOption {
         type = types.attrsOf hookType;
-        description = lib.mdDoc "Preswitch hook executed before mode switch.";
+        description = "Preswitch hook executed before mode switch.";
         default = { };
       };
 
       predetect = mkOption {
         type = types.attrsOf hookType;
-        description = lib.mdDoc ''
+        description = ''
           Predetect hook executed before autorandr attempts to run xrandr.
         '';
         default = { };
@@ -211,19 +210,19 @@ let
     options = {
       postswitch = mkOption {
         type = hookType;
-        description = lib.mdDoc "Postswitch hook executed after mode switch.";
+        description = "Postswitch hook executed after mode switch.";
         default = "";
       };
 
       preswitch = mkOption {
         type = hookType;
-        description = lib.mdDoc "Preswitch hook executed before mode switch.";
+        description = "Preswitch hook executed before mode switch.";
         default = "";
       };
 
       predetect = mkOption {
         type = hookType;
-        description = lib.mdDoc ''
+        description = ''
           Predetect hook executed before autorandr attempts to run xrandr.
         '';
         default = "";
@@ -277,11 +276,11 @@ let
 in {
   options = {
     programs.autorandr = {
-      enable = mkEnableOption (lib.mdDoc "Autorandr");
+      enable = mkEnableOption "Autorandr";
 
       hooks = mkOption {
         type = globalHooksModule;
-        description = lib.mdDoc "Global hook scripts";
+        description = "Global hook scripts";
         default = { };
         example = literalExpression ''
           {
@@ -313,7 +312,7 @@ in {
 
       profiles = mkOption {
         type = types.attrsOf profileModule;
-        description = lib.mdDoc "Autorandr profiles specification.";
+        description = "Autorandr profiles specification.";
         default = { };
         example = literalExpression ''
           {
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index 614c4a699..b48dc3129 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -27,12 +27,12 @@ in {
 
   options = {
     programs.bash = {
-      enable = mkEnableOption (lib.mdDoc "GNU Bourne-Again SHell");
+      enable = mkEnableOption "GNU Bourne-Again SHell";
 
       enableCompletion = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable Bash completion for all interactive Bash shells.
 
           Note, if you use NixOS or nix-darwin and do not have Bash completion
@@ -51,34 +51,33 @@ in {
       historySize = mkOption {
         type = types.int;
         default = 10000;
-        description = lib.mdDoc "Number of history lines to keep in memory.";
+        description = "Number of history lines to keep in memory.";
       };
 
       historyFile = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "Location of the bash history file.";
+        description = "Location of the bash history file.";
       };
 
       historyFileSize = mkOption {
         type = types.int;
         default = 100000;
-        description = lib.mdDoc "Number of history lines to keep on file.";
+        description = "Number of history lines to keep on file.";
       };
 
       historyControl = mkOption {
         type =
           types.listOf (types.enum [ "erasedups" "ignoredups" "ignorespace" ]);
         default = [ ];
-        description =
-          lib.mdDoc "Controlling how commands are saved on the history list.";
+        description = "Controlling how commands are saved on the history list.";
       };
 
       historyIgnore = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "ls" "cd" "exit" ];
-        description = lib.mdDoc
+        description =
           "List of commands that should not be saved to the history list.";
       };
 
@@ -100,7 +99,7 @@ in {
           "checkjobs"
         ];
         example = [ "extglob" "-cdspell" ];
-        description = lib.mdDoc ''
+        description = ''
           Shell options to set. Prefix an option with
           "`-`" to unset.
         '';
@@ -110,7 +109,7 @@ in {
         default = { };
         type = types.attrs;
         example = { MAILCHECK = 30; };
-        description = lib.mdDoc ''
+        description = ''
           Environment variables that will be set for the Bash session.
         '';
       };
@@ -124,7 +123,7 @@ in {
             ".." = "cd ..";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that maps aliases (the top level attribute names in
           this option) to command strings or directly to build outputs.
         '';
@@ -133,7 +132,7 @@ in {
       profileExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           Extra commands that should be run when initializing a login
           shell.
         '';
@@ -142,7 +141,7 @@ in {
       initExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           Extra commands that should be run when initializing an
           interactive shell.
         '';
@@ -151,7 +150,7 @@ in {
       bashrcExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           Extra commands that should be placed in {file}`~/.bashrc`.
           Note that these commands will be run even in non-interactive shells.
         '';
@@ -160,7 +159,7 @@ in {
       logoutExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           Extra commands that should be run when logging out of an
           interactive shell.
         '';
diff --git a/modules/programs/bashmount.nix b/modules/programs/bashmount.nix
index 4a418b429..66c5809b2 100644
--- a/modules/programs/bashmount.nix
+++ b/modules/programs/bashmount.nix
@@ -10,12 +10,12 @@ in {
   meta.maintainers = [ maintainers.AndersonTorres ];
 
   options.programs.bashmount = {
-    enable = mkEnableOption (lib.mdDoc "bashmount");
+    enable = mkEnableOption "bashmount";
 
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/bashmount/config`. Look at
         <https://github.com/jamielinux/bashmount/blob/master/bashmount.conf>
diff --git a/modules/programs/bat.nix b/modules/programs/bat.nix
index 5fa605e7a..6890a28a8 100644
--- a/modules/programs/bat.nix
+++ b/modules/programs/bat.nix
@@ -17,7 +17,7 @@ in {
   meta.maintainers = [ ];
 
   options.programs.bat = {
-    enable = mkEnableOption (lib.mdDoc "bat, a cat clone with wings");
+    enable = mkEnableOption "bat, a cat clone with wings";
 
     config = mkOption {
       type = with types; attrsOf (either str (listOf str));
@@ -27,7 +27,7 @@ in {
         pager = "less -FR";
         map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ];
       };
-      description = lib.mdDoc ''
+      description = ''
         Bat configuration.
       '';
     };
@@ -37,7 +37,7 @@ in {
       default = [ ];
       example = literalExpression
         "with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];";
-      description = lib.mdDoc ''
+      description = ''
         Additional bat packages to install.
       '';
     };
@@ -55,7 +55,7 @@ in {
           } + "/Dracula.tmTheme");
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Additional themes to provide.
       '';
     };
diff --git a/modules/programs/beets.nix b/modules/programs/beets.nix
index 20e785ca0..dab98c301 100644
--- a/modules/programs/beets.nix
+++ b/modules/programs/beets.nix
@@ -20,7 +20,7 @@ in {
         else
           cfg.settings != { };
         defaultText = "false";
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable the beets music library manager. This
           defaults to `false` for state
           version ≥ 19.03. For earlier versions beets is enabled if
@@ -34,7 +34,7 @@ in {
         defaultText = literalExpression "pkgs.beets";
         example =
           literalExpression "(pkgs.beets.override { enableCheck = true; })";
-        description = lib.mdDoc ''
+        description = ''
           The `beets` package to use.
           Can be used to specify extensions.
         '';
@@ -43,22 +43,22 @@ in {
       settings = mkOption {
         type = yamlFormat.type;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/beets/config.yaml`
         '';
       };
 
       mpdIntegration = {
-        enableStats = mkEnableOption (lib.mdDoc "mpdstats plugin and service");
+        enableStats = mkEnableOption "mpdstats plugin and service";
 
-        enableUpdate = mkEnableOption (lib.mdDoc "mpdupdate plugin");
+        enableUpdate = mkEnableOption "mpdupdate plugin";
 
         host = mkOption {
           type = types.str;
           default = "localhost";
           example = "10.0.0.42";
-          description = lib.mdDoc "The host that mpdstats will connect to.";
+          description = "The host that mpdstats will connect to.";
         };
 
         port = mkOption {
@@ -66,7 +66,7 @@ in {
           default = config.services.mpd.network.port;
           defaultText = literalExpression "config.services.mpd.network.port";
           example = 6601;
-          description = lib.mdDoc "The port that mpdstats will connect to.";
+          description = "The port that mpdstats will connect to.";
         };
       };
     };
diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix
index a25ebd53e..5e84edbe6 100644
--- a/modules/programs/borgmatic.nix
+++ b/modules/programs/borgmatic.nix
@@ -16,7 +16,7 @@ let
   mkRetentionOption = frequency:
     mkNullableOption {
       type = types.int;
-      description = lib.mdDoc
+      description =
         "Number of ${frequency} archives to keep. Use -1 for no limit.";
       example = 3;
     };
@@ -24,20 +24,20 @@ let
   extraConfigOption = mkOption {
     type = yamlFormat.type;
     default = { };
-    description = lib.mdDoc "Extra settings.";
+    description = "Extra settings.";
   };
 
   consistencyCheckModule = types.submodule {
     options = {
       name = mkOption {
         type = types.enum [ "repository" "archives" "data" "extract" ];
-        description = lib.mdDoc "Name of consistency check to run.";
+        description = "Name of consistency check to run.";
         example = "repository";
       };
 
       frequency = mkNullableOption {
         type = types.strMatching "([[:digit:]]+ .*)|always";
-        description = lib.mdDoc "Frequency of this type of check";
+        description = "Frequency of this type of check";
         example = "2 weeks";
       };
     };
@@ -51,20 +51,20 @@ let
       location = {
         sourceDirectories = mkOption {
           type = types.listOf types.str;
-          description = lib.mdDoc "Directories to backup.";
+          description = "Directories to backup.";
           example = literalExpression "[config.home.homeDirectory]";
         };
 
         repositories = mkOption {
           type = types.listOf types.str;
-          description = lib.mdDoc "Paths to repositories.";
+          description = "Paths to repositories.";
           example =
             literalExpression ''["ssh://myuser@myrepo.myserver.com/./repo"]'';
         };
 
         excludeHomeManagerSymlinks = mkOption {
           type = types.bool;
-          description = lib.mdDoc ''
+          description = ''
             Whether to exclude Home Manager generated symbolic links from
             the backups. This facilitates restoring the whole home
             directory when the Nix store doesn't contain the latest
@@ -80,8 +80,7 @@ let
       storage = {
         encryptionPasscommand = mkNullableOption {
           type = types.str;
-          description =
-            lib.mdDoc "Command writing the passphrase to standard output.";
+          description = "Command writing the passphrase to standard output.";
           example =
             literalExpression ''"''${pkgs.password-store}/bin/pass borg-repo"'';
         };
@@ -91,8 +90,7 @@ let
       retention = {
         keepWithin = mkNullableOption {
           type = types.strMatching "[[:digit:]]+[Hdwmy]";
-          description =
-            lib.mdDoc "Keep all archives within this time interval.";
+          description = "Keep all archives within this time interval.";
           example = "2d";
         };
 
@@ -111,7 +109,7 @@ let
         checks = mkOption {
           type = types.listOf consistencyCheckModule;
           default = [ ];
-          description = lib.mdDoc "Consistency checks to run";
+          description = "Consistency checks to run";
           example = literalExpression ''
             [
               {
@@ -182,13 +180,13 @@ in {
 
   options = {
     programs.borgmatic = {
-      enable = mkEnableOption (lib.mdDoc "Borgmatic");
+      enable = mkEnableOption "Borgmatic";
 
-      package = mkPackageOptionMD pkgs "borgmatic" { };
+      package = mkPackageOption pkgs "borgmatic" { };
 
       backups = mkOption {
         type = types.attrsOf configModule;
-        description = lib.mdDoc ''
+        description = ''
           Borgmatic allows for several named backup configurations,
           each with its own source directories and repositories.
         '';
diff --git a/modules/programs/bottom.nix b/modules/programs/bottom.nix
index b2c0875f3..810307b14 100644
--- a/modules/programs/bottom.nix
+++ b/modules/programs/bottom.nix
@@ -11,21 +11,21 @@ let
 in {
   options = {
     programs.bottom = {
-      enable = mkEnableOption (lib.mdDoc ''
+      enable = mkEnableOption ''
         bottom, a cross-platform graphical process/system monitor with a
-        customizable interface'');
+        customizable interface'';
 
       package = mkOption {
         type = types.package;
         default = pkgs.bottom;
         defaultText = literalExpression "pkgs.bottom";
-        description = lib.mdDoc "Package providing {command}`bottom`.";
+        description = "Package providing {command}`bottom`.";
       };
 
       settings = mkOption {
         type = tomlFormat.type;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/bottom/bottom.toml`.
 
diff --git a/modules/programs/boxxy.nix b/modules/programs/boxxy.nix
index 9dbfc60bf..566a11e7e 100644
--- a/modules/programs/boxxy.nix
+++ b/modules/programs/boxxy.nix
@@ -12,7 +12,7 @@ let
     options = {
       name = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           Unique identifier of the boxxy rule. This can be any single-line string.
         '';
       };
@@ -21,7 +21,7 @@ let
         type = types.str;
         default = "";
         example = "~/.ssh";
-        description = lib.mdDoc ''
+        description = ''
           What directory/file to redirect.
         '';
       };
@@ -30,7 +30,7 @@ let
         type = types.str;
         default = "";
         example = literalExpression ''"''${config.xdg.configHome}/ssh"'';
-        description = lib.mdDoc ''
+        description = ''
           Where that file/directory should be rewritten to.
         '';
       };
@@ -38,7 +38,7 @@ let
       mode = mkOption {
         type = types.enum [ "file" "directory" ];
         default = "directory";
-        description = lib.mdDoc ''
+        description = ''
           Does the current path redirect a file or a directory?
         '';
       };
@@ -52,7 +52,7 @@ let
             "/usr/bin/sh"
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           Apply redirection ONLY to specified executable names.
         '';
       };
@@ -61,7 +61,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = [ "/home/example/Projects/my-project" ];
-        description = lib.mdDoc ''
+        description = ''
           Apply redirection ONLY when in a certain directory.
         '';
       };
@@ -74,7 +74,7 @@ let
             MY_ENV_VAR = "my_env_var_value";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Give certain environment variables for said match.
         '';
       };
@@ -82,15 +82,14 @@ let
   };
 in {
   options.programs.boxxy = {
-    enable =
-      mkEnableOption (lib.mdDoc "boxxy: Boxes in badly behaving applications");
+    enable = mkEnableOption "boxxy: Boxes in badly behaving applications";
 
-    package = mkPackageOptionMD pkgs "boxxy" { };
+    package = mkPackageOption pkgs "boxxy" { };
 
     rules = mkOption {
       type = types.listOf boxxyRulesOpts;
       default = [ ];
-      description = lib.mdDoc "List of boxxy rules";
+      description = "List of boxxy rules";
     };
   };
 
diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix
index d9b11f9e7..179b1224d 100644
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@@ -12,7 +12,7 @@ let
     freeformType = tomlFormat.type;
 
     options = {
-      modal = mkEnableOption (lib.mdDoc "modal (vim) mode");
+      modal = mkEnableOption "modal (vim) mode";
 
       verbs = mkOption {
         type = with types; listOf (attrsOf (either bool str));
@@ -30,7 +30,7 @@ let
             }
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           Define new verbs. For more information, see
           [Verb Definition Attributes](https://dystroy.org/broot/documentation/configuration/#verb-definition-attributes)
           in the broot documentation.
@@ -81,7 +81,7 @@ let
             code_fg = "lightyellow";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Color configuration.
 
           Complete list of keys (expected to change before the v1 of broot):
@@ -149,13 +149,12 @@ in {
   ];
 
   options.programs.broot = {
-    enable =
-      mkEnableOption (lib.mdDoc "Broot, a better way to navigate directories");
+    enable = mkEnableOption "Broot, a better way to navigate directories";
 
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -163,7 +162,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -171,7 +170,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
@@ -180,13 +179,13 @@ in {
       type = types.package;
       default = pkgs.broot;
       defaultText = literalExpression "pkgs.broot";
-      description = lib.mdDoc "Package providing broot";
+      description = "Package providing broot";
     };
 
     settings = mkOption {
       type = types.submodule settingsModule;
       default = { };
-      description = lib.mdDoc "Verbatim config entries";
+      description = "Verbatim config entries";
     };
   };
 
diff --git a/modules/programs/browserpass.nix b/modules/programs/browserpass.nix
index c0cc223cd..8faf53151 100644
--- a/modules/programs/browserpass.nix
+++ b/modules/programs/browserpass.nix
@@ -8,14 +8,13 @@ let
 in {
   options = {
     programs.browserpass = {
-      enable =
-        mkEnableOption (lib.mdDoc "the browserpass extension host application");
+      enable = mkEnableOption "the browserpass extension host application";
 
       browsers = mkOption {
         type = types.listOf (types.enum browsers);
         default = browsers;
         example = [ "firefox" ];
-        description = lib.mdDoc "Which browsers to install browserpass for";
+        description = "Which browsers to install browserpass for";
       };
     };
   };
diff --git a/modules/programs/btop.nix b/modules/programs/btop.nix
index 45e54f659..e30a9f43e 100644
--- a/modules/programs/btop.nix
+++ b/modules/programs/btop.nix
@@ -28,9 +28,9 @@ in {
   meta.maintainers = [ hm.maintainers.GaetanLepage ];
 
   options.programs.btop = {
-    enable = mkEnableOption (lib.mdDoc "btop");
+    enable = mkEnableOption "btop";
 
-    package = mkPackageOptionMD pkgs "btop" { };
+    package = mkPackageOption pkgs "btop" { };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool float int str ]);
@@ -39,7 +39,7 @@ in {
         color_theme = "Default";
         theme_background = false;
       };
-      description = lib.mdDoc ''
+      description = ''
         Options to add to {file}`btop.conf` file.
         See <https://github.com/aristocratos/btop#configurability>
         for options.
@@ -49,7 +49,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to the {file}`btop.conf` file.
       '';
     };
diff --git a/modules/programs/chromium.nix b/modules/programs/chromium.nix
index a663b93c8..11a105477 100644
--- a/modules/programs/chromium.nix
+++ b/modules/programs/chromium.nix
@@ -23,7 +23,7 @@ let
         type = types.bool;
         default = false;
         example = true;
-        description = lib.mdDoc "Whether to enable ${name}.";
+        description = "Whether to enable ${name}.";
       };
 
       package = mkOption {
@@ -31,7 +31,7 @@ let
         type = types.package;
         default = defaultPkg;
         defaultText = literalExpression "pkgs.${browser}";
-        description = lib.mdDoc "The ${name} package to use.";
+        description = "The ${name} package to use.";
       };
 
       commandLineArgs = mkOption {
@@ -39,7 +39,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = [ "--enable-logging=stderr" "--ignore-gpu-blocklist" ];
-        description = lib.mdDoc ''
+        description = ''
           List of command-line arguments to be passed to ${name}.
 
           For a list of common switches, see
@@ -60,7 +60,7 @@ let
               options = {
                 id = mkOption {
                   type = strMatching "[a-zA-Z]{32}";
-                  description = lib.mdDoc ''
+                  description = ''
                     The extension's ID from the Chrome Web Store url or the unpacked crx.
                   '';
                   default = "";
@@ -68,7 +68,7 @@ let
 
                 updateUrl = mkOption {
                   type = str;
-                  description = lib.mdDoc ''
+                  description = ''
                     URL of the extension's update manifest XML file. Linux only.
                   '';
                   default = "https://clients2.google.com/service/update2/crx";
@@ -78,7 +78,7 @@ let
 
                 crxPath = mkOption {
                   type = nullOr path;
-                  description = lib.mdDoc ''
+                  description = ''
                     Path to the extension's crx file. Linux only.
                   '';
                   default = null;
@@ -87,7 +87,7 @@ let
 
                 version = mkOption {
                   type = nullOr str;
-                  description = lib.mdDoc ''
+                  description = ''
                     The extension's version, required for local installation. Linux only.
                   '';
                   default = null;
@@ -111,7 +111,7 @@ let
             }
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           List of ${name} extensions to install.
           To find the extension ID, check its URL on the
           [Chrome Web Store](https://chrome.google.com/webstore/category/extensions).
diff --git a/modules/programs/command-not-found/command-not-found.nix b/modules/programs/command-not-found/command-not-found.nix
index d04711e01..f1a790235 100644
--- a/modules/programs/command-not-found/command-not-found.nix
+++ b/modules/programs/command-not-found/command-not-found.nix
@@ -31,13 +31,12 @@ let
 
 in {
   options.programs.command-not-found = {
-    enable =
-      mkEnableOption (lib.mdDoc "command-not-found hook for interactive shell");
+    enable = mkEnableOption "command-not-found hook for interactive shell";
 
     dbPath = mkOption {
       default =
         "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite";
-      description = lib.mdDoc ''
+      description = ''
         Absolute path to {file}`programs.sqlite`. By
         default this file will be provided by your channel
         (nixexprs.tar.xz).
diff --git a/modules/programs/comodoro.nix b/modules/programs/comodoro.nix
index 7b8c076ce..fba0bce86 100644
--- a/modules/programs/comodoro.nix
+++ b/modules/programs/comodoro.nix
@@ -8,15 +8,14 @@ in {
   meta.maintainers = with lib.hm.maintainers; [ soywod ];
 
   options.programs.comodoro = {
-    enable =
-      lib.mkEnableOption (lib.mdDoc "Comodoro, a CLI to manage your time");
+    enable = lib.mkEnableOption "Comodoro, a CLI to manage your time";
 
-    package = lib.mkPackageOptionMD pkgs "comodoro" { };
+    package = lib.mkPackageOption pkgs "comodoro" { };
 
     settings = lib.mkOption {
       type = lib.types.submodule { freeformType = tomlFormat.type; };
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Comodoro configuration.
         See <https://pimalaya.org/comodoro/cli/configuration/> for supported values.
       '';
diff --git a/modules/programs/darcs.nix b/modules/programs/darcs.nix
index d01c1dd6f..a2a45cba4 100644
--- a/modules/programs/darcs.nix
+++ b/modules/programs/darcs.nix
@@ -11,7 +11,7 @@ in {
 
   options = {
     programs.darcs = {
-      enable = mkEnableOption (lib.mdDoc "darcs");
+      enable = mkEnableOption "darcs";
 
       package = mkPackageOption pkgs "darcs" { };
 
@@ -19,7 +19,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "Fred Bloggs <fred@example.net>" ];
-        description = lib.mdDoc ''
+        description = ''
           If this list has a single entry, it will be used as the author
           when you record a patch. If there are multiple entries, Darcs
           will prompt you to choose one of them.
@@ -30,7 +30,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "^.idea$" ".iml$" "^.stack-work$" ];
-        description = lib.mdDoc "File patterns to ignore";
+        description = "File patterns to ignore";
       };
     };
   };
diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix
index 5e4e0a39f..de4610893 100644
--- a/modules/programs/dircolors.nix
+++ b/modules/programs/dircolors.nix
@@ -13,7 +13,7 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to manage {file}`.dir_colors`
         and set `LS_COLORS`.
       '';
@@ -22,7 +22,7 @@ in {
     enableBashIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -30,7 +30,7 @@ in {
     enableFishIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
@@ -38,7 +38,7 @@ in {
     enableZshIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -46,7 +46,7 @@ in {
     settings = mkOption {
       type = with types; attrsOf str;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Options to add to {file}`.dir_colors` file.
         See {command}`dircolors --print-database`
         for options.
@@ -63,7 +63,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to {file}`.dir_colors` file.
       '';
     };
diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index d96f14db0..89ba2bf91 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -22,12 +22,12 @@ in {
   meta.maintainers = [ maintainers.rycee ];
 
   options.programs.direnv = {
-    enable = mkEnableOption (lib.mdDoc "direnv, the environment switcher");
+    enable = mkEnableOption "direnv, the environment switcher";
 
     config = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/direnv/direnv.toml`.
 
@@ -40,7 +40,7 @@ in {
     stdlib = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Custom stdlib written to
         {file}`$XDG_CONFIG_HOME/direnv/direnvrc`.
       '';
@@ -49,7 +49,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -57,7 +57,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -66,7 +66,7 @@ in {
       default = true;
       type = types.bool;
       readOnly = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration. Note, enabling the direnv module
         will always active its functionality for Fish since the direnv package
         automatically gets loaded in Fish. If this is not the case try adding
@@ -80,15 +80,15 @@ in {
     enableNushellIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Nushell integration.
       '';
     };
 
     nix-direnv = {
-      enable = mkEnableOption (lib.mdDoc ''
+      enable = mkEnableOption ''
         [nix-direnv](https://github.com/nix-community/nix-direnv),
-        a fast, persistent use_nix implementation for direnv'');
+        a fast, persistent use_nix implementation for direnv'';
     };
 
   };
diff --git a/modules/programs/discocss.nix b/modules/programs/discocss.nix
index b9beb094c..5a35f187f 100644
--- a/modules/programs/discocss.nix
+++ b/modules/programs/discocss.nix
@@ -9,22 +9,22 @@ in {
   options = {
     programs.discocss = {
       enable = mkEnableOption
-        (lib.mdDoc "discocss, a tiny Discord CSS injector for Linux and MacOS");
+        "discocss, a tiny Discord CSS injector for Linux and MacOS";
 
-      package = mkPackageOptionMD pkgs "discocss" { };
+      package = mkPackageOption pkgs "discocss" { };
 
-      discordPackage = mkPackageOptionMD pkgs "discord" { };
+      discordPackage = mkPackageOption pkgs "discord" { };
 
       discordAlias = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Whether to alias discocss to discord.";
+        description = "Whether to alias discocss to discord.";
       };
 
       css = mkOption {
         type = types.str;
         default = "";
-        description = lib.mdDoc "The custom CSS for discocss to use.";
+        description = "The custom CSS for discocss to use.";
       };
     };
   };
diff --git a/modules/programs/eclipse.nix b/modules/programs/eclipse.nix
index d7b4ed8b0..4c9328a01 100644
--- a/modules/programs/eclipse.nix
+++ b/modules/programs/eclipse.nix
@@ -11,14 +11,14 @@ in {
 
   options = {
     programs.eclipse = {
-      enable = mkEnableOption (lib.mdDoc "Eclipse");
+      enable = mkEnableOption "Eclipse";
 
       package = mkOption {
         type = types.package;
         default = pkgs.eclipses.eclipse-platform;
         defaultText = literalExpression "pkgs.eclipses.eclipse-platform";
         example = literalExpression "pkgs.eclipses.eclipse-java";
-        description = lib.mdDoc ''
+        description = ''
           The Eclipse package to install.
         '';
       };
@@ -27,7 +27,7 @@ in {
         type = types.bool;
         default = false;
         example = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable the Lombok Java Agent in Eclipse. This is
           necessary to use the Lombok class annotations.
         '';
@@ -36,13 +36,13 @@ in {
       jvmArgs = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc "JVM arguments to use for the Eclipse process.";
+        description = "JVM arguments to use for the Eclipse process.";
       };
 
       plugins = mkOption {
         type = types.listOf types.package;
         default = [ ];
-        description = lib.mdDoc "Plugins that should be added to Eclipse.";
+        description = "Plugins that should be added to Eclipse.";
       };
     };
   };
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index 9d1604cb3..dfab66cf1 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -28,14 +28,14 @@ in {
 
   options = {
     programs.emacs = {
-      enable = mkEnableOption (lib.mdDoc "Emacs");
+      enable = mkEnableOption "Emacs";
 
       package = mkOption {
         type = types.package;
         default = pkgs.emacs;
         defaultText = literalExpression "pkgs.emacs";
         example = literalExpression "pkgs.emacs25-nox";
-        description = lib.mdDoc "The Emacs package to use.";
+        description = "The Emacs package to use.";
       };
 
       # NOTE: The config is placed in default.el instead of ~/.emacs.d so that
@@ -48,7 +48,7 @@ in {
         example = ''
           (setq standard-indent 2)
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration to include in the Emacs default init file. See
           <https://www.gnu.org/software/emacs/manual/html_node/elisp/Init-File.html>
           for more.
@@ -64,7 +64,7 @@ in {
         type = hm.types.selectorFunction;
         defaultText = "epkgs: []";
         example = literalExpression "epkgs: [ epkgs.emms epkgs.magit ]";
-        description = lib.mdDoc ''
+        description = ''
           Extra packages available to Emacs. To get a list of
           available packages run:
           {command}`nix-env -f '<nixpkgs>' -qaP -A emacsPackages`.
@@ -81,7 +81,7 @@ in {
             # ...
           };
         '';
-        description = lib.mdDoc ''
+        description = ''
           Allows overriding packages within the Emacs package set.
         '';
       };
@@ -90,7 +90,7 @@ in {
         type = types.package;
         visible = false;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           The Emacs package including any overrides and extra packages.
         '';
       };
diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix
index 6a8b680ef..3d178f942 100644
--- a/modules/programs/eww.nix
+++ b/modules/programs/eww.nix
@@ -10,14 +10,14 @@ in {
   meta.maintainers = [ hm.maintainers.mainrs ];
 
   options.programs.eww = {
-    enable = mkEnableOption (lib.mdDoc "eww");
+    enable = mkEnableOption "eww";
 
     package = mkOption {
       type = types.package;
       default = pkgs.eww;
       defaultText = literalExpression "pkgs.eww";
       example = literalExpression "pkgs.eww";
-      description = lib.mdDoc ''
+      description = ''
         The eww package to install.
       '';
     };
@@ -25,7 +25,7 @@ in {
     configDir = mkOption {
       type = types.path;
       example = literalExpression "./eww-config-dir";
-      description = lib.mdDoc ''
+      description = ''
         The directory that gets symlinked to
         {file}`$XDG_CONFIG_HOME/eww`.
       '';
diff --git a/modules/programs/exa.nix b/modules/programs/exa.nix
index 0bcd75631..afe83e737 100644
--- a/modules/programs/exa.nix
+++ b/modules/programs/exa.nix
@@ -6,17 +6,15 @@ with lib;
   meta.maintainers = [ hm.maintainers.kalhauge ];
 
   options.programs.exa = {
-    enable =
-      mkEnableOption (lib.mdDoc "exa, a modern replacement for {command}`ls`");
+    enable = mkEnableOption "exa, a modern replacement for {command}`ls`";
 
-    enableAliases =
-      mkEnableOption (lib.mdDoc "recommended exa aliases (ls, ll…)");
+    enableAliases = mkEnableOption "recommended exa aliases (ls, ll…)";
 
     extraOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--group-directories-first" "--header" ];
-      description = lib.mdDoc ''
+      description = ''
         Extra command line options passed to exa.
       '';
     };
@@ -24,7 +22,7 @@ with lib;
     icons = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Display icons next to file names ({option}`--icons` argument).
       '';
     };
@@ -32,12 +30,12 @@ with lib;
     git = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         List each file's Git status if tracked or ignored ({option}`--git` argument).
       '';
     };
 
-    package = mkPackageOptionMD pkgs "exa" { };
+    package = mkPackageOption pkgs "exa" { };
   };
 
   config = let
diff --git a/modules/programs/feh.nix b/modules/programs/feh.nix
index 04cd06001..f44f184a3 100644
--- a/modules/programs/feh.nix
+++ b/modules/programs/feh.nix
@@ -25,9 +25,9 @@ let
 
 in {
   options.programs.feh = {
-    enable = mkEnableOption (lib.mdDoc "feh - a fast and light image viewer");
+    enable = mkEnableOption "feh - a fast and light image viewer";
 
-    package = mkPackageOptionMD pkgs "feh" { };
+    package = mkPackageOption pkgs "feh" { };
 
     buttons = mkOption {
       default = { };
@@ -37,7 +37,7 @@ in {
         zoom_out = "C-4";
         prev_img = [ 3 "C-3" ];
       };
-      description = lib.mdDoc ''
+      description = ''
         Override feh's default mouse button mapping. If you want to disable an
         action, set its value to null. If you want to bind multiple buttons to
         an action, set its value to a list.
@@ -54,7 +54,7 @@ in {
         zoom_out = "minus";
         prev_img = [ "h" "Left" ];
       };
-      description = lib.mdDoc ''
+      description = ''
         Override feh's default keybindings. If you want to disable a keybinding
         set its value to null. If you want to bind multiple keys to an action,
         set its value to a list.
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 788386dba..fc80c226c 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -134,7 +134,7 @@ in {
 
   options = {
     programs.firefox = {
-      enable = mkEnableOption (lib.mdDoc "Firefox");
+      enable = mkEnableOption "Firefox";
 
       package = mkOption {
         type = types.package;
@@ -154,7 +154,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           The Firefox package to use. If state version ≥ 19.09 then
           this should be a wrapped Firefox package. For earlier state
           versions it should be an unwrapped Firefox package.
@@ -167,13 +167,13 @@ in {
             name = mkOption {
               type = types.str;
               default = name;
-              description = lib.mdDoc "Profile name.";
+              description = "Profile name.";
             };
 
             id = mkOption {
               type = types.ints.unsigned;
               default = 0;
-              description = lib.mdDoc ''
+              description = ''
                 Profile ID. This should be set to a unique number per profile.
               '';
             };
@@ -198,7 +198,7 @@ in {
                   }];
                 }
               '';
-              description = lib.mdDoc ''
+              description = ''
                 Attribute set of Firefox preferences.
 
                 Firefox only supports int, bool, and string types for
@@ -210,7 +210,7 @@ in {
             extraConfig = mkOption {
               type = types.lines;
               default = "";
-              description = lib.mdDoc ''
+              description = ''
                 Extra preferences to add to {file}`user.js`.
               '';
             };
@@ -218,7 +218,7 @@ in {
             userChrome = mkOption {
               type = types.lines;
               default = "";
-              description = lib.mdDoc "Custom Firefox user chrome CSS.";
+              description = "Custom Firefox user chrome CSS.";
               example = ''
                 /* Hide tab bar in FF Quantum */
                 @-moz-document url("chrome://browser/content/browser.xul") {
@@ -237,7 +237,7 @@ in {
             userContent = mkOption {
               type = types.lines;
               default = "";
-              description = lib.mdDoc "Custom Firefox user content CSS.";
+              description = "Custom Firefox user content CSS.";
               example = ''
                 /* Hide scrollbar in FF Quantum */
                 *{scrollbar-width:none !important}
@@ -251,25 +251,24 @@ in {
                     name = mkOption {
                       type = types.str;
                       default = name;
-                      description = lib.mdDoc "Bookmark name.";
+                      description = "Bookmark name.";
                     };
 
                     tags = mkOption {
                       type = types.listOf types.str;
                       default = [ ];
-                      description = lib.mdDoc "Bookmark tags.";
+                      description = "Bookmark tags.";
                     };
 
                     keyword = mkOption {
                       type = types.nullOr types.str;
                       default = null;
-                      description = lib.mdDoc "Bookmark search keyword.";
+                      description = "Bookmark search keyword.";
                     };
 
                     url = mkOption {
                       type = types.str;
-                      description =
-                        lib.mdDoc "Bookmark url, use %s for search terms.";
+                      description = "Bookmark url, use %s for search terms.";
                     };
                   };
                 }) // {
@@ -283,20 +282,19 @@ in {
                     name = mkOption {
                       type = types.str;
                       default = name;
-                      description = lib.mdDoc "Directory name.";
+                      description = "Directory name.";
                     };
 
                     bookmarks = mkOption {
                       type = types.listOf nodeType;
                       default = [ ];
-                      description = lib.mdDoc "Bookmarks within directory.";
+                      description = "Bookmarks within directory.";
                     };
 
                     toolbar = mkOption {
                       type = types.bool;
                       default = false;
-                      description =
-                        lib.mdDoc "If directory should be shown in toolbar.";
+                      description = "If directory should be shown in toolbar.";
                     };
                   };
                 }) // {
@@ -336,7 +334,7 @@ in {
                   }
                 ]
               '';
-              description = lib.mdDoc ''
+              description = ''
                 Preloaded bookmarks. Note, this may silently overwrite any
                 previously existing bookmarks!
               '';
@@ -345,21 +343,21 @@ in {
             path = mkOption {
               type = types.str;
               default = name;
-              description = lib.mdDoc "Profile path.";
+              description = "Profile path.";
             };
 
             isDefault = mkOption {
               type = types.bool;
               default = config.id == 0;
               defaultText = "true if profile ID is 0";
-              description = lib.mdDoc "Whether this is a default profile.";
+              description = "Whether this is a default profile.";
             };
 
             search = {
               force = mkOption {
                 type = with types; bool;
                 default = false;
-                description = lib.mdDoc ''
+                description = ''
                   Whether to force replace the existing search
                   configuration. This is recommended since Firefox will
                   replace the symlink for the search configuration on every
@@ -372,7 +370,7 @@ in {
                 type = with types; nullOr str;
                 default = null;
                 example = "DuckDuckGo";
-                description = lib.mdDoc ''
+                description = ''
                   The default search engine used in the address bar and search bar.
                 '';
               };
@@ -381,7 +379,7 @@ in {
                 type = with types; uniq (listOf str);
                 default = [ ];
                 example = [ "DuckDuckGo" "Google" ];
-                description = lib.mdDoc ''
+                description = ''
                   The order the search engines are listed in. Any engines
                   that aren't included in this list will be listed after
                   these in an unspecified order.
@@ -417,7 +415,7 @@ in {
                     "Google".metaData.alias = "@g"; # builtin engines only support specifying one additional alias
                   }
                 '';
-                description = lib.mdDoc ''
+                description = ''
                   Attribute set of search engine configurations. Engines
                   that only have {var}`metaData` specified will
                   be treated as builtin to Firefox.
@@ -443,7 +441,7 @@ in {
                   privacy-badger
                 ]
               '';
-              description = lib.mdDoc ''
+              description = ''
                 List of Firefox add-on packages to install for this profile.
                 Some pre-packaged add-ons are accessible from the
                 [Nix User Repository](https://github.com/nix-community/NUR).
@@ -463,13 +461,13 @@ in {
           };
         }));
         default = { };
-        description = lib.mdDoc "Attribute set of Firefox profiles.";
+        description = "Attribute set of Firefox profiles.";
       };
 
       enableGnomeExtensions = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable the GNOME Shell native host connector. Note, you
           also need to set the NixOS option
           `services.gnome.gnome-browser-connector.enable` to
diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index a74164fb4..109fb5294 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -10,7 +10,7 @@ let
     options = {
       src = mkOption {
         type = types.path;
-        description = lib.mdDoc ''
+        description = ''
           Path to the plugin folder.
 
           Relevant pieces will be added to the fish function path and
@@ -22,7 +22,7 @@ let
 
       name = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           The name of the plugin.
         '';
       };
@@ -33,7 +33,7 @@ let
     options = {
       body = mkOption {
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           The function body.
         '';
       };
@@ -41,7 +41,7 @@ let
       argumentNames = mkOption {
         type = with types; nullOr (either str (listOf str));
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Assigns the value of successive command line arguments to the names
           given.
         '';
@@ -50,7 +50,7 @@ let
       description = mkOption {
         type = with types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           A description of what the function does, suitable as a completion
           description.
         '';
@@ -59,7 +59,7 @@ let
       wraps = mkOption {
         type = with types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Causes the function to inherit completions from the given wrapped
           command.
         '';
@@ -68,7 +68,7 @@ let
       onEvent = mkOption {
         type = with types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Tells fish to run this function when the specified named event is
           emitted. Fish internally generates named events e.g. when showing the
           prompt.
@@ -78,7 +78,7 @@ let
       onVariable = mkOption {
         type = with types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Tells fish to run this function when the specified variable changes
           value.
         '';
@@ -87,7 +87,7 @@ let
       onJobExit = mkOption {
         type = with types; nullOr (either str int);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Tells fish to run this function when the job with the specified group
           ID exits. Instead of a PID, the stringer `caller` can
           be specified. This is only legal when in a command substitution, and
@@ -100,7 +100,7 @@ let
         type = with types; nullOr (either str int);
         default = null;
         example = "$fish_pid";
-        description = lib.mdDoc ''
+        description = ''
           Tells fish to run this function when the fish child process with the
           specified process ID exits. Instead of a PID, for backwards
           compatibility, `%self` can be specified as an alias
@@ -113,7 +113,7 @@ let
         type = with types; nullOr (either str int);
         default = null;
         example = [ "SIGHUP" "HUP" 1 ];
-        description = lib.mdDoc ''
+        description = ''
           Tells fish to run this function when the specified signal is
           delievered. The signal can be a signal number or signal name.
         '';
@@ -122,7 +122,7 @@ let
       noScopeShadowing = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Allows the function to access the variables of calling functions.
         '';
       };
@@ -130,7 +130,7 @@ let
       inheritVariable = mkOption {
         type = with types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Snapshots the value of the specified variable and defines a local
           variable with that same name and value when the function is defined.
         '';
@@ -172,14 +172,13 @@ in {
 
   options = {
     programs.fish = {
-      enable =
-        mkEnableOption (lib.mdDoc "fish, the friendly interactive shell");
+      enable = mkEnableOption "fish, the friendly interactive shell";
 
       package = mkOption {
         type = types.package;
         default = pkgs.fish;
         defaultText = literalExpression "pkgs.fish";
-        description = lib.mdDoc ''
+        description = ''
           The fish package to install. May be used to change the version.
         '';
       };
@@ -193,7 +192,7 @@ in {
             "..." = "cd ../..";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that maps aliases (the top level attribute names
           in this option) to command strings or directly to build outputs.
         '';
@@ -206,7 +205,7 @@ in {
           l = "less";
           gco = "git checkout";
         };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that maps aliases (the top level attribute names
           in this option) to abbreviations. Abbreviations are expanded with
           the longer phrase after they are entered.
@@ -216,7 +215,7 @@ in {
       shellInit = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Shell script code called during fish shell
           initialisation.
         '';
@@ -225,7 +224,7 @@ in {
       loginShellInit = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Shell script code called during fish login shell
           initialisation.
         '';
@@ -234,7 +233,7 @@ in {
       interactiveShellInit = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Shell script code called during interactive fish shell
           initialisation.
         '';
@@ -269,7 +268,7 @@ in {
           }
         ]
       '';
-      description = lib.mdDoc ''
+      description = ''
         The plugins to source in
         {file}`conf.d/99plugins.fish`.
       '';
@@ -288,7 +287,7 @@ in {
           gitignore = "curl -sL https://www.gitignore.io/api/$argv";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Basic functions to add to fish. For more information see
         <https://fishshell.com/docs/current/cmds/function.html>.
       '';
diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix
index 7a4ff79a1..79832dced 100644
--- a/modules/programs/foot.nix
+++ b/modules/programs/foot.nix
@@ -11,21 +11,21 @@ in {
   meta.maintainers = with lib.maintainers; [ plabadens ];
 
   options.programs.foot = {
-    enable = mkEnableOption (lib.mdDoc "Foot terminal");
+    enable = mkEnableOption "Foot terminal";
 
     package = mkOption {
       type = types.package;
       default = pkgs.foot;
       defaultText = literalExpression "pkgs.foot";
-      description = lib.mdDoc "The foot package to install";
+      description = "The foot package to install";
     };
 
-    server.enable = mkEnableOption (lib.mdDoc "Foot terminal server");
+    server.enable = mkEnableOption "Foot terminal server";
 
     settings = mkOption {
       type = iniFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/foot/foot.ini`. See <https://codeberg.org/dnkl/foot/src/branch/master/foot.ini>
         for a list of available options.
diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix
index 228632815..5057c36d6 100644
--- a/modules/programs/fuzzel.nix
+++ b/modules/programs/fuzzel.nix
@@ -2,8 +2,7 @@
 
 let
 
-  inherit (lib)
-    literalExpression mkEnableOption mkPackageOptionMD mkOption mkIf;
+  inherit (lib) literalExpression mkEnableOption mkPackageOption mkOption mkIf;
 
   cfg = config.programs.fuzzel;
 
@@ -13,9 +12,9 @@ in {
   meta.maintainers = [ lib.maintainers.Scrumplex ];
 
   options.programs.fuzzel = {
-    enable = mkEnableOption (lib.mdDoc "fuzzel");
+    enable = mkEnableOption "fuzzel";
 
-    package = mkPackageOptionMD pkgs "fuzzel" { };
+    package = mkPackageOption pkgs "fuzzel" { };
 
     settings = mkOption {
       type = iniFormat.type;
@@ -29,7 +28,7 @@ in {
           colors.background = "ffffffff";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration for fuzzel written to
         {file}`$XDG_CONFIG_HOME/fuzzel/fuzzel.ini`. See
         {manpage}`fuzzel.ini(5)` for a list of available options.
diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix
index a19e29c87..7544c1eff 100644
--- a/modules/programs/fzf.nix
+++ b/modules/programs/fzf.nix
@@ -17,20 +17,20 @@ in {
   ];
 
   options.programs.fzf = {
-    enable = mkEnableOption (lib.mdDoc "fzf - a command-line fuzzy finder");
+    enable = mkEnableOption "fzf - a command-line fuzzy finder";
 
     package = mkOption {
       type = types.package;
       default = pkgs.fzf;
       defaultText = literalExpression "pkgs.fzf";
-      description = lib.mdDoc "Package providing the {command}`fzf` tool.";
+      description = "Package providing the {command}`fzf` tool.";
     };
 
     defaultCommand = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "fd --type f";
-      description = lib.mdDoc ''
+      description = ''
         The command that gets executed as the default source for fzf
         when running.
       '';
@@ -40,7 +40,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--height 40%" "--border" ];
-      description = lib.mdDoc ''
+      description = ''
         Extra command line options given to fzf by default.
       '';
     };
@@ -49,7 +49,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "fd --type f";
-      description = lib.mdDoc ''
+      description = ''
         The command that gets executed as the source for fzf for the
         CTRL-T keybinding.
       '';
@@ -59,7 +59,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--preview 'head {}'" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line options for the CTRL-T keybinding.
       '';
     };
@@ -68,7 +68,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "fd --type d";
-      description = lib.mdDoc ''
+      description = ''
         The command that gets executed as the source for fzf for the
         ALT-C keybinding.
       '';
@@ -78,7 +78,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--preview 'tree -C {} | head -200'" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line options for the ALT-C keybinding.
       '';
     };
@@ -87,7 +87,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--sort" "--exact" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line options for the CTRL-R keybinding.
       '';
     };
@@ -103,7 +103,7 @@ in {
           "fg+" = "#d4d4d4";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Color scheme options added to `FZF_DEFAULT_OPTS`. See
         <https://github.com/junegunn/fzf/wiki/Color-schemes>
         for documentation.
@@ -111,15 +111,15 @@ in {
     };
 
     tmux = {
-      enableShellIntegration = mkEnableOption (lib.mdDoc ''
+      enableShellIntegration = mkEnableOption ''
         setting `FZF_TMUX=1` which causes shell integration to use fzf-tmux
-      '');
+      '';
 
       shellIntegrationOptions = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = literalExpression ''[ "-d 40%" ]'';
-        description = lib.mdDoc ''
+        description = ''
           If {option}`programs.fzf.tmux.enableShellIntegration` is set to `true`,
           shell integration will use these options for fzf-tmux.
           See {command}`fzf-tmux --help` for available options.
@@ -130,7 +130,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -138,7 +138,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -146,7 +146,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/gallery-dl.nix b/modules/programs/gallery-dl.nix
index 0d32ee3ef..accad55fb 100644
--- a/modules/programs/gallery-dl.nix
+++ b/modules/programs/gallery-dl.nix
@@ -12,7 +12,7 @@ in {
   meta.maintainers = [ ];
 
   options.programs.gallery-dl = {
-    enable = mkEnableOption (lib.mdDoc "gallery-dl");
+    enable = mkEnableOption "gallery-dl";
 
     settings = mkOption {
       type = jsonFormat.type;
@@ -22,7 +22,7 @@ in {
           extractor.base-directory = "~/Downloads";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/gallery-dl/config.json`. See
         <https://github.com/mikf/gallery-dl#configuration>
diff --git a/modules/programs/getmail-accounts.nix b/modules/programs/getmail-accounts.nix
index 6cf8ac104..e2ff94051 100644
--- a/modules/programs/getmail-accounts.nix
+++ b/modules/programs/getmail-accounts.nix
@@ -4,14 +4,13 @@ with lib;
 
 {
   options.getmail = {
-    enable =
-      mkEnableOption (lib.mdDoc "the getmail mail retriever for this account");
+    enable = mkEnableOption "the getmail mail retriever for this account";
 
     destinationCommand = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "\${pkgs.maildrop}/bin/maildrop";
-      description = lib.mdDoc ''
+      description = ''
         Specify a command delivering the incoming mail to your maildir.
       '';
     };
@@ -20,7 +19,7 @@ with lib;
       type = types.nonEmptyListOf types.str;
       default = [ ];
       example = [ "INBOX" "INBOX.spam" ];
-      description = lib.mdDoc ''
+      description = ''
         A non-empty list of mailboxes. To download all mail you can
         use the `ALL` mailbox.
       '';
@@ -29,7 +28,7 @@ with lib;
     delete = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Enable if you want to delete read messages from the server. Most
         users should either enable `delete` or disable
         `readAll`.
@@ -39,7 +38,7 @@ with lib;
     readAll = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Enable if you want to fetch all, even the read messages from the
         server. Most users should either enable `delete` or
         disable `readAll`.
diff --git a/modules/programs/gh.nix b/modules/programs/gh.nix
index 7dd162cf7..fcf0f8f32 100644
--- a/modules/programs/gh.nix
+++ b/modules/programs/gh.nix
@@ -21,14 +21,14 @@ let
             pv = "pr view";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Aliases that allow you to create nicknames for gh commands.
         '';
       };
       editor = mkOption {
         type = types.str;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           The editor that gh should run when creating issues, pull requests, etc.
           If blank, will refer to environment.
         '';
@@ -37,7 +37,7 @@ let
         type = types.str;
         default = "https";
         example = "ssh";
-        description = lib.mdDoc ''
+        description = ''
           The protocol to use when performing Git operations.
         '';
       };
@@ -63,19 +63,19 @@ in {
     ];
 
   options.programs.gh = {
-    enable = mkEnableOption (lib.mdDoc "GitHub CLI tool");
+    enable = mkEnableOption "GitHub CLI tool";
 
     package = mkOption {
       type = types.package;
       default = pkgs.gh;
       defaultText = literalExpression "pkgs.gh";
-      description = lib.mdDoc "Package providing {command}`gh`.";
+      description = "Package providing {command}`gh`.";
     };
 
     settings = mkOption {
       type = settingsType;
       default = { };
-      description = lib.mdDoc
+      description =
         "Configuration written to {file}`$XDG_CONFIG_HOME/gh/config.yml`.";
       example = literalExpression ''
         {
@@ -92,15 +92,14 @@ in {
     };
 
     enableGitCredentialHelper =
-      mkEnableOption (lib.mdDoc "the gh git credential helper for github.com")
-      // {
+      mkEnableOption "the gh git credential helper for github.com" // {
         default = true;
       };
 
     extensions = mkOption {
       type = types.listOf types.package;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         gh extensions, see <https://cli.github.com/manual/gh_extension>.
       '';
       example = literalExpression "[ pkgs.gh-eco ]";
diff --git a/modules/programs/git-cliff.nix b/modules/programs/git-cliff.nix
index b3de22335..cd7fb529d 100644
--- a/modules/programs/git-cliff.nix
+++ b/modules/programs/git-cliff.nix
@@ -11,9 +11,9 @@ in {
   meta.maintainers = [ hm.maintainers.NateCox ];
 
   options.programs.git-cliff = {
-    enable = mkEnableOption (lib.mdDoc "git-cliff changelog generator");
+    enable = mkEnableOption "git-cliff changelog generator";
 
-    package = mkPackageOptionMD pkgs "git-cliff" { };
+    package = mkPackageOption pkgs "git-cliff" { };
 
     settings = mkOption {
       type = tomlFormat.type;
@@ -24,7 +24,7 @@ in {
           trim = true;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/git-cliff/cliff.toml`. See
         <https://git-cliff.org/docs/configuration>
diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth.nix
index b1b1c5b92..4833e8068 100644
--- a/modules/programs/git-credential-oauth.nix
+++ b/modules/programs/git-credential-oauth.nix
@@ -9,10 +9,9 @@ in {
 
   options = {
     programs.git-credential-oauth = {
-      enable =
-        lib.mkEnableOption (lib.mdDoc "Git authentication handler for OAuth");
+      enable = lib.mkEnableOption "Git authentication handler for OAuth";
 
-      package = lib.mkPackageOptionMD pkgs "git-credential-oauth" { };
+      package = lib.mkPackageOption pkgs "git-credential-oauth" { };
     };
   };
 
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index bae2e40dd..b9aca2db3 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -62,7 +62,7 @@ let
     options = {
       key = mkOption {
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The default GPG signing key fingerprint.
 
           Set to `null` to let GnuPG decide what signing key
@@ -73,15 +73,14 @@ let
       signByDefault = mkOption {
         type = types.bool;
         default = false;
-        description =
-          lib.mdDoc "Whether commits and tags should be signed by default.";
+        description = "Whether commits and tags should be signed by default.";
       };
 
       gpgPath = mkOption {
         type = types.str;
         default = "${pkgs.gnupg}/bin/gpg2";
         defaultText = "\${pkgs.gnupg}/bin/gpg2";
-        description = lib.mdDoc "Path to GnuPG binary to use.";
+        description = "Path to GnuPG binary to use.";
       };
     };
   };
@@ -91,7 +90,7 @@ let
       condition = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Include this configuration only when {var}`condition`
           matches. Allowed conditions are described in
           {manpage}`git-config(1)`.
@@ -100,7 +99,7 @@ let
 
       path = mkOption {
         type = with types; either str path;
-        description = lib.mdDoc "Path of the configuration file to include.";
+        description = "Path of the configuration file to include.";
       };
 
       contents = mkOption {
@@ -118,7 +117,7 @@ let
             };
           };
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration to include. If empty then a path must be given.
 
           This follows the configuration structure as described in
@@ -129,7 +128,7 @@ let
       contentSuffix = mkOption {
         type = types.str;
         default = "gitconfig";
-        description = lib.mdDoc ''
+        description = ''
           Nix store name for the git configuration text file,
           when generating the configuration text from nix options.
         '';
@@ -146,13 +145,13 @@ in {
 
   options = {
     programs.git = {
-      enable = mkEnableOption (lib.mdDoc "Git");
+      enable = mkEnableOption "Git";
 
       package = mkOption {
         type = types.package;
         default = pkgs.git;
         defaultText = literalExpression "pkgs.git";
-        description = lib.mdDoc ''
+        description = ''
           Git package to install. Use {var}`pkgs.gitAndTools.gitFull`
           to gain access to {command}`git send-email` for instance.
         '';
@@ -161,27 +160,26 @@ in {
       userName = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "Default user name to use.";
+        description = "Default user name to use.";
       };
 
       userEmail = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "Default user email to use.";
+        description = "Default user email to use.";
       };
 
       aliases = mkOption {
         type = types.attrsOf types.str;
         default = { };
         example = { co = "checkout"; };
-        description = lib.mdDoc "Git aliases to define.";
+        description = "Git aliases to define.";
       };
 
       signing = mkOption {
         type = types.nullOr signModule;
         default = null;
-        description =
-          lib.mdDoc "Options related to signing commits using GnuPG.";
+        description = "Options related to signing commits using GnuPG.";
       };
 
       extraConfig = mkOption {
@@ -191,7 +189,7 @@ in {
           core = { whitespace = "trailing-space,space-before-tab"; };
           url."ssh://git@host".insteadOf = "otherhost";
         };
-        description = lib.mdDoc ''
+        description = ''
           Additional configuration to add. The use of string values is
           deprecated and will be removed in the future.
         '';
@@ -205,7 +203,7 @@ in {
             pre-commit = ./pre-commit-script;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration helper for Git hooks.
           See <https://git-scm.com/docs/githooks>
           for reference.
@@ -221,15 +219,14 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "*~" "*.swp" ];
-        description =
-          lib.mdDoc "List of paths that should be globally ignored.";
+        description = "List of paths that should be globally ignored.";
       };
 
       attributes = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "*.pdf diff=pdf" ];
-        description = lib.mdDoc "List of defining attributes set globally.";
+        description = "List of defining attributes set globally.";
       };
 
       includes = mkOption {
@@ -244,16 +241,16 @@ in {
             }
           ]
         '';
-        description = lib.mdDoc "List of configuration files to include.";
+        description = "List of configuration files to include.";
       };
 
       lfs = {
-        enable = mkEnableOption (lib.mdDoc "Git Large File Storage");
+        enable = mkEnableOption "Git Large File Storage";
 
         skipSmudge = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             Skip automatic downloading of objects on clone or pull.
             This requires a manual {command}`git lfs pull`
             every time a new commit is checked out on your repository.
@@ -262,8 +259,8 @@ in {
       };
 
       difftastic = {
-        enable = mkEnableOption (lib.mdDoc "") // {
-          description = lib.mdDoc ''
+        enable = mkEnableOption "" // {
+          description = ''
             Enable the {command}`difftastic` syntax highlighter.
             See <https://github.com/Wilfred/difftastic>.
           '';
@@ -273,7 +270,7 @@ in {
           type = types.enum [ "light" "dark" ];
           default = "light";
           example = "dark";
-          description = lib.mdDoc ''
+          description = ''
             Determines whether difftastic should use the lighter or darker colors
             for syntax highlighting.
           '';
@@ -283,7 +280,7 @@ in {
           type = types.enum [ "always" "auto" "never" ];
           default = "auto";
           example = "always";
-          description = lib.mdDoc ''
+          description = ''
             Determines when difftastic should color its output.
           '';
         };
@@ -293,21 +290,21 @@ in {
             types.enum [ "side-by-side" "side-by-side-show-both" "inline" ];
           default = "side-by-side";
           example = "inline";
-          description = lib.mdDoc ''
+          description = ''
             Determines how the output displays - in one column or two columns.
           '';
         };
       };
 
       delta = {
-        enable = mkEnableOption (lib.mdDoc "") // {
-          description = lib.mdDoc ''
+        enable = mkEnableOption "" // {
+          description = ''
             Whether to enable the {command}`delta` syntax highlighter.
             See <https://github.com/dandavison/delta>.
           '';
         };
 
-        package = mkPackageOptionMD pkgs "delta" { };
+        package = mkPackageOption pkgs "delta" { };
 
         options = mkOption {
           type = with types;
@@ -325,15 +322,15 @@ in {
               file-decoration-style = "none";
             };
           };
-          description = lib.mdDoc ''
+          description = ''
             Options to configure delta.
           '';
         };
       };
 
       diff-so-fancy = {
-        enable = mkEnableOption (lib.mdDoc "") // {
-          description = lib.mdDoc ''
+        enable = mkEnableOption "" // {
+          description = ''
             Enable the {command}`diff-so-fancy` diff colorizer.
             See <https://github.com/so-fancy/diff-so-fancy>.
           '';
@@ -342,7 +339,7 @@ in {
         pagerOpts = mkOption {
           type = types.listOf types.str;
           default = [ "--tabs=4" "-RFX" ];
-          description = lib.mdDoc ''
+          description = ''
             Arguments to be passed to {command}`less`.
           '';
         };
@@ -351,7 +348,7 @@ in {
           type = types.bool;
           default = true;
           example = false;
-          description = lib.mdDoc ''
+          description = ''
             Whether the first block of an empty line should be colored.
           '';
         };
@@ -360,7 +357,7 @@ in {
           type = types.bool;
           default = true;
           example = false;
-          description = lib.mdDoc ''
+          description = ''
             Simplify git header chunks to a more human readable format.
           '';
         };
@@ -369,7 +366,7 @@ in {
           type = types.bool;
           default = true;
           example = false;
-          description = lib.mdDoc ''
+          description = ''
             Whether the `+` or `-` at
             line-start should be removed.
           '';
@@ -379,7 +376,7 @@ in {
           type = types.bool;
           default = true;
           example = false;
-          description = lib.mdDoc ''
+          description = ''
             By default, the separator for the file header uses Unicode
             line-drawing characters. If this is causing output errors on
             your terminal, set this to false to use ASCII characters instead.
@@ -390,7 +387,7 @@ in {
           type = types.nullOr types.int;
           default = null;
           example = false;
-          description = lib.mdDoc ''
+          description = ''
             By default, the separator for the file header spans the full
             width of the terminal. Use this setting to set the width of
             the file header manually.
diff --git a/modules/programs/gitui.nix b/modules/programs/gitui.nix
index f513d4be1..029986b9e 100644
--- a/modules/programs/gitui.nix
+++ b/modules/programs/gitui.nix
@@ -10,14 +10,14 @@ in {
   meta.maintainers = [ hm.maintainers.mifom ];
 
   options.programs.gitui = {
-    enable = mkEnableOption
-      (lib.mdDoc "gitui, blazing fast terminal-ui for git written in rust");
+    enable =
+      mkEnableOption "gitui, blazing fast terminal-ui for git written in rust";
 
     package = mkOption {
       type = types.package;
       default = pkgs.gitui;
       defaultText = "pkgs.gitui";
-      description = lib.mdDoc "The package to use.";
+      description = "The package to use.";
     };
 
     keyConfig = mkOption {
@@ -28,7 +28,7 @@ in {
         quit: Some(( code: Char('q'), modifiers: ( bits: 0,),)),
         exit_popup: Some(( code: Esc, modifiers: ( bits: 0,),)),
       '';
-      description = lib.mdDoc ''
+      description = ''
         Key config in Ron file format. This is written to
         {file}`$XDG_CONFIG_HOME/gitui/key_config.ron`.
       '';
@@ -61,7 +61,7 @@ in {
           branch_fg: LightYellow,
         )
       '';
-      description = lib.mdDoc ''
+      description = ''
         Theme in Ron file format. This is written to
         {file}`$XDG_CONFIG_HOME/gitui/theme.ron`.
       '';
diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal.nix
index ebaa06c88..e1922cd0c 100644
--- a/modules/programs/gnome-terminal.nix
+++ b/modules/programs/gnome-terminal.nix
@@ -18,12 +18,12 @@ let
     options = {
       foreground = mkOption {
         type = types.str;
-        description = lib.mdDoc "The foreground color.";
+        description = "The foreground color.";
       };
 
       background = mkOption {
         type = types.str;
-        description = lib.mdDoc "The background color.";
+        description = "The background color.";
       };
     };
   });
@@ -32,37 +32,35 @@ let
     options = {
       foregroundColor = mkOption {
         type = types.str;
-        description = lib.mdDoc "The foreground color.";
+        description = "The foreground color.";
       };
 
       backgroundColor = mkOption {
         type = types.str;
-        description = lib.mdDoc "The background color.";
+        description = "The background color.";
       };
 
       boldColor = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description =
-          lib.mdDoc "The bold color, null to use same as foreground.";
+        description = "The bold color, null to use same as foreground.";
       };
 
       palette = mkOption {
         type = types.listOf types.str;
-        description = lib.mdDoc "The terminal palette.";
+        description = "The terminal palette.";
       };
 
       cursor = mkOption {
         default = null;
         type = types.nullOr backForeSubModule;
-        description = lib.mdDoc "The color for the terminal cursor.";
+        description = "The color for the terminal cursor.";
       };
 
       highlight = mkOption {
         default = null;
         type = types.nullOr backForeSubModule;
-        description =
-          lib.mdDoc "The colors for the terminal’s highlighted area.";
+        description = "The colors for the terminal’s highlighted area.";
       };
     };
   });
@@ -72,43 +70,42 @@ let
       default = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc "Whether this should be the default profile.";
+        description = "Whether this should be the default profile.";
       };
 
       visibleName = mkOption {
         type = types.str;
-        description = lib.mdDoc "The profile name.";
+        description = "The profile name.";
       };
 
       colors = mkOption {
         default = null;
         type = types.nullOr profileColorsSubModule;
-        description =
-          lib.mdDoc "The terminal colors, null to use system default.";
+        description = "The terminal colors, null to use system default.";
       };
 
       cursorBlinkMode = mkOption {
         default = "system";
         type = types.enum [ "system" "on" "off" ];
-        description = lib.mdDoc "The cursor blink mode.";
+        description = "The cursor blink mode.";
       };
 
       cursorShape = mkOption {
         default = "block";
         type = types.enum [ "block" "ibeam" "underline" ];
-        description = lib.mdDoc "The cursor shape.";
+        description = "The cursor shape.";
       };
 
       font = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc "The font name, null to use system default.";
+        description = "The font name, null to use system default.";
       };
 
       allowBold = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           If `true`, allow applications in the
           terminal to make text boldface.
         '';
@@ -117,19 +114,19 @@ let
       scrollOnOutput = mkOption {
         default = true;
         type = types.bool;
-        description = lib.mdDoc "Whether to scroll when output is written.";
+        description = "Whether to scroll when output is written.";
       };
 
       showScrollbar = mkOption {
         default = true;
         type = types.bool;
-        description = lib.mdDoc "Whether the scroll bar should be visible.";
+        description = "Whether the scroll bar should be visible.";
       };
 
       scrollbackLines = mkOption {
         default = 10000;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           The number of scrollback lines to keep, null for infinite.
         '';
       };
@@ -137,7 +134,7 @@ let
       customCommand = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           The command to use to start the shell, or null for default shell.
         '';
       };
@@ -145,13 +142,13 @@ let
       loginShell = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc "Run command as a login shell.";
+        description = "Run command as a login shell.";
       };
 
       backspaceBinding = mkOption {
         default = "ascii-delete";
         type = eraseBinding;
-        description = lib.mdDoc ''
+        description = ''
           Which string the terminal should send to an application when the user
           presses the *Backspace* key.
 
@@ -175,13 +172,13 @@ let
       boldIsBright = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc "Whether bold text is shown in bright colors.";
+        description = "Whether bold text is shown in bright colors.";
       };
 
       deleteBinding = mkOption {
         default = "delete-sequence";
         type = eraseBinding;
-        description = lib.mdDoc ''
+        description = ''
           Which string the terminal should send to an application when the user
           presses the *Delete* key.
 
@@ -205,13 +202,13 @@ let
       audibleBell = mkOption {
         default = true;
         type = types.bool;
-        description = lib.mdDoc "Turn on/off the terminal's bell.";
+        description = "Turn on/off the terminal's bell.";
       };
 
       transparencyPercent = mkOption {
         default = null;
         type = types.nullOr (types.ints.between 0 100);
-        description = lib.mdDoc "Background transparency in percent.";
+        description = "Background transparency in percent.";
       };
     };
   });
@@ -278,24 +275,24 @@ in {
 
   options = {
     programs.gnome-terminal = {
-      enable = mkEnableOption (lib.mdDoc "Gnome Terminal");
+      enable = mkEnableOption "Gnome Terminal";
 
       showMenubar = mkOption {
         default = true;
         type = types.bool;
-        description = lib.mdDoc "Whether to show the menubar by default";
+        description = "Whether to show the menubar by default";
       };
 
       themeVariant = mkOption {
         default = "default";
         type = types.enum [ "default" "light" "dark" "system" ];
-        description = lib.mdDoc "The theme variation to request";
+        description = "The theme variation to request";
       };
 
       profile = mkOption {
         default = { };
         type = types.attrsOf profileSubModule;
-        description = lib.mdDoc "A set of Gnome Terminal profiles.";
+        description = "A set of Gnome Terminal profiles.";
       };
     };
   };
diff --git a/modules/programs/go.nix b/modules/programs/go.nix
index 7816e1a3f..5d150036b 100644
--- a/modules/programs/go.nix
+++ b/modules/programs/go.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     programs.go = {
-      enable = mkEnableOption (lib.mdDoc "Go");
+      enable = mkEnableOption "Go";
 
       package = mkOption {
         type = types.package;
         default = pkgs.go;
         defaultText = literalExpression "pkgs.go";
-        description = lib.mdDoc "The Go package to use.";
+        description = "The Go package to use.";
       };
 
       packages = mkOption {
@@ -29,14 +29,14 @@ in {
             "golang.org/x/time" = builtins.fetchGit "https://go.googlesource.com/time";
           }
         '';
-        description = lib.mdDoc "Packages to add to GOPATH.";
+        description = "Packages to add to GOPATH.";
       };
 
       goPath = mkOption {
         type = with types; nullOr str;
         default = null;
         example = "go";
-        description = lib.mdDoc ''
+        description = ''
           Primary {env}`GOPATH` relative to
           {env}`HOME`. It will be exported first and therefore
           used by default by the Go tooling.
@@ -47,7 +47,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "extraGoPath1" "extraGoPath2" ];
-        description = lib.mdDoc ''
+        description = ''
           Extra {env}`GOPATH`s relative to {env}`HOME` appended
           after [](#opt-programs.go.goPath), if that option is set.
         '';
@@ -57,14 +57,14 @@ in {
         type = with types; nullOr str;
         default = null;
         example = ".local/bin.go";
-        description = lib.mdDoc "GOBIN relative to HOME";
+        description = "GOBIN relative to HOME";
       };
 
       goPrivate = mkOption {
         type = with types; listOf str;
         default = [ ];
         example = [ "*.corp.example.com" "rsc.io/private" ];
-        description = lib.mdDoc ''
+        description = ''
           The {env}`GOPRIVATE` environment variable controls
           which modules the go command considers to be private (not
           available publicly) and should therefore not use the proxy
diff --git a/modules/programs/gpg.nix b/modules/programs/gpg.nix
index 3c1e061c8..ca1d15f8c 100644
--- a/modules/programs/gpg.nix
+++ b/modules/programs/gpg.nix
@@ -25,14 +25,14 @@ let
       text = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Text of an OpenPGP public key.
         '';
       };
 
       source = mkOption {
         type = types.path;
-        description = lib.mdDoc ''
+        description = ''
           Path of an OpenPGP public key file.
         '';
       };
@@ -62,7 +62,7 @@ let
             }.${v}
           else
             v;
-        description = lib.mdDoc ''
+        description = ''
           The amount of trust you have in the key ownership and the care the
           owner puts into signing other keys. The available levels are
 
@@ -139,7 +139,7 @@ let
 
 in {
   options.programs.gpg = {
-    enable = mkEnableOption (lib.mdDoc "GnuPG");
+    enable = mkEnableOption "GnuPG";
 
     package = mkOption {
       type = types.package;
@@ -147,7 +147,7 @@ in {
       defaultText = literalExpression "pkgs.gnupg";
       example = literalExpression "pkgs.gnupg23";
       description =
-        lib.mdDoc "The Gnupg package to use (also used the gpg-agent service).";
+        "The Gnupg package to use (also used the gpg-agent service).";
     };
 
     settings = mkOption {
@@ -159,7 +159,7 @@ in {
           s2k-cipher-algo = "AES128";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         GnuPG configuration options. Available options are described
         in
         [
@@ -178,7 +178,7 @@ in {
           disable-ccid = true;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         SCdaemon configuration options. Available options are described
         in
         [
@@ -193,13 +193,13 @@ in {
       default = "${config.home.homeDirectory}/.gnupg";
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/.gnupg"'';
-      description = lib.mdDoc "Directory to store keychains and configuration.";
+      description = "Directory to store keychains and configuration.";
     };
 
     mutableKeys = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         If set to `true`, you may manage your keyring as a user
         using the `gpg` command. Upon activation, the keyring
         will have managed keys added without overwriting unmanaged keys.
@@ -213,7 +213,7 @@ in {
     mutableTrust = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         If set to `true`, you may manage trust as a user using
         the {command}`gpg` command. Upon activation, trusted keys have
         their trust set without overwriting unmanaged keys.
@@ -232,7 +232,7 @@ in {
         [ { source = ./pubkeys.txt; } ]
       '';
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         A list of public keys to be imported into GnuPG. Note, these key files
         will be copied into the world-readable Nix store.
       '';
diff --git a/modules/programs/havoc.nix b/modules/programs/havoc.nix
index ffb421811..c83a1c39a 100644
--- a/modules/programs/havoc.nix
+++ b/modules/programs/havoc.nix
@@ -11,14 +11,14 @@ in {
   meta.maintainers = with lib.maintainers; [ AndersonTorres ];
 
   options.programs.havoc = {
-    enable = mkEnableOption (lib.mdDoc "Havoc terminal");
+    enable = mkEnableOption "Havoc terminal";
 
-    package = mkPackageOptionMD pkgs "havoc" { };
+    package = mkPackageOption pkgs "havoc" { };
 
     settings = mkOption {
       type = iniFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/havoc.cfg`. See <https://raw.githubusercontent.com/ii8/havoc/master/havoc.cfg>
         for a list of available options.
diff --git a/modules/programs/helix.nix b/modules/programs/helix.nix
index 657a65722..e8390ffd6 100644
--- a/modules/programs/helix.nix
+++ b/modules/programs/helix.nix
@@ -9,19 +9,19 @@ in {
   meta.maintainers = [ hm.maintainers.Philipp-M ];
 
   options.programs.helix = {
-    enable = mkEnableOption (lib.mdDoc "helix text editor");
+    enable = mkEnableOption "helix text editor";
 
     package = mkOption {
       type = types.package;
       default = pkgs.helix;
       defaultText = literalExpression "pkgs.helix";
-      description = lib.mdDoc "The package to use for helix.";
+      description = "The package to use for helix.";
     };
 
     defaultEditor = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to configure {command}`hx` as the default
         editor using the {env}`EDITOR` environment variable.
       '';
@@ -45,7 +45,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/helix/config.toml`.
 
@@ -80,7 +80,7 @@ in {
           }];
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Language specific configuration at
         {file}`$XDG_CONFIG_HOME/helix/languages.toml`.
 
@@ -149,7 +149,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Each theme is written to
         {file}`$XDG_CONFIG_HOME/helix/themes/theme-name.toml`.
         Where the name of each attribute is the theme-name (in the example "base16").
diff --git a/modules/programs/hexchat.nix b/modules/programs/hexchat.nix
index 2f22b6a82..01ece4bdb 100644
--- a/modules/programs/hexchat.nix
+++ b/modules/programs/hexchat.nix
@@ -11,37 +11,37 @@ let
         autoconnect = mkOption {
           type = nullOr bool;
           default = false;
-          description = lib.mdDoc "Autoconnect to network.";
+          description = "Autoconnect to network.";
         };
 
         connectToSelectedServerOnly = mkOption {
           type = nullOr bool;
           default = true;
-          description = lib.mdDoc "Connect to selected server only.";
+          description = "Connect to selected server only.";
         };
 
         bypassProxy = mkOption {
           type = nullOr bool;
           default = true;
-          description = lib.mdDoc "Bypass proxy.";
+          description = "Bypass proxy.";
         };
 
         forceSSL = mkOption {
           type = nullOr bool;
           default = false;
-          description = lib.mdDoc "Use SSL for all servers.";
+          description = "Use SSL for all servers.";
         };
 
         acceptInvalidSSLCertificates = mkOption {
           type = nullOr bool;
           default = false;
-          description = lib.mdDoc "Accept invalid SSL certificates.";
+          description = "Accept invalid SSL certificates.";
         };
 
         useGlobalUserInformation = mkOption {
           type = nullOr bool;
           default = false;
-          description = lib.mdDoc "Use global user information.";
+          description = "Use global user information.";
         };
       };
     };
@@ -53,29 +53,27 @@ let
           type = listOf str;
           default = [ ];
           example = [ "#home-manager" "#linux" "#nix" ];
-          description =
-            lib.mdDoc "Channels list to autojoin on connecting to server.";
+          description = "Channels list to autojoin on connecting to server.";
         };
 
         charset = mkOption {
           type = nullOr str;
           default = null;
           example = "UTF-8 (Unicode)";
-          description = lib.mdDoc "Character set.";
+          description = "Character set.";
         };
 
         commands = mkOption {
           type = listOf str;
           default = [ ];
           example = literalExpression ''[ "ECHO Greetings fellow Nixer! ]'';
-          description =
-            lib.mdDoc "Commands to be executed on connecting to server.";
+          description = "Commands to be executed on connecting to server.";
         };
 
         loginMethod = mkOption {
           type = nullOr (enum (attrNames loginMethodMap));
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             The login method. The allowed options are:
 
             `null`
@@ -110,13 +108,13 @@ let
         nickname = mkOption {
           type = nullOr str;
           default = null;
-          description = lib.mdDoc "Primary nickname.";
+          description = "Primary nickname.";
         };
 
         nickname2 = mkOption {
           type = nullOr str;
           default = null;
-          description = lib.mdDoc "Secondary nickname.";
+          description = "Secondary nickname.";
         };
 
         options = mkOption {
@@ -126,13 +124,13 @@ let
             autoconnect = true;
             useGlobalUserInformation = true;
           };
-          description = lib.mdDoc "Channel options.";
+          description = "Channel options.";
         };
 
         password = mkOption {
           type = nullOr str;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             Password to use. Note this password will be readable by all user's
             in the Nix store.
           '';
@@ -141,7 +139,7 @@ let
         realName = mkOption {
           type = nullOr str;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             Real name. Is used to populate the real name field that appears when
             someone uses the `WHOIS` command on your nick.
           '';
@@ -150,7 +148,7 @@ let
         userName = mkOption {
           type = nullOr str;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             User name. Part of your `user@host` hostmask that
             appears to other on IRC.
           '';
@@ -160,7 +158,7 @@ let
           type = listOf str;
           default = [ ];
           example = [ "irc.oftc.net" ];
-          description = lib.mdDoc "IRC Server Address List.";
+          description = "IRC Server Address List.";
         };
       };
     };
@@ -221,7 +219,7 @@ in {
   meta.maintainers = with maintainers; [ thiagokokada ];
 
   options.programs.hexchat = with types; {
-    enable = mkEnableOption (lib.mdDoc "HexChat, a graphical IRC client");
+    enable = mkEnableOption "HexChat, a graphical IRC client";
 
     channels = mkOption {
       type = attrsOf modChannelOption;
@@ -256,7 +254,7 @@ in {
             userName = "my_username";
           };
         }'';
-      description = lib.mdDoc ''
+      description = ''
         Configures {file}`$XDG_CONFIG_HOME/hexchat/servlist.conf`.
       '';
     };
@@ -272,7 +270,7 @@ in {
           text_font = "Monospace 14";
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration for {file}`$XDG_CONFIG_HOME/hexchat/hexchat.conf`, see
         <https://hexchat.readthedocs.io/en/latest/settings.html#list-of-settings>
         for supported values.
@@ -282,7 +280,7 @@ in {
     overwriteConfigFiles = mkOption {
       type = nullOr bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Enables overwriting HexChat configuration files
         ({file}`hexchat.conf`, {file}`servlist.conf`).
         Any existing HexChat configuration will be lost. Make sure to back up
@@ -309,7 +307,7 @@ in {
           stripRoot = false;
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Theme package for HexChat. Expects a derivation containing decompressed
         theme files. Note, `.hct` files are actually ZIP files,
         as seen in example.
diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index fb0dbde35..26e56312b 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -118,12 +118,12 @@ in {
 
   options = {
     programs.himalaya = {
-      enable = lib.mkEnableOption (lib.mdDoc "the Himalaya email client");
-      package = lib.mkPackageOptionMD pkgs "himalaya" { };
+      enable = lib.mkEnableOption "the Himalaya email client";
+      package = lib.mkPackageOption pkgs "himalaya" { };
       settings = lib.mkOption {
         type = lib.types.submodule { freeformType = tomlFormat.type; };
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Himalaya global configuration.
           See <https://pimalaya.org/himalaya/cli/configuration/global.html> for supported values.
         '';
@@ -132,8 +132,7 @@ in {
 
     services = {
       himalaya-notify = {
-        enable = lib.mkEnableOption
-          (lib.mdDoc "the Himalaya new emails notifier service");
+        enable = lib.mkEnableOption "the Himalaya new emails notifier service";
 
         environment = lib.mkOption {
           type = with lib.types; attrsOf str;
@@ -143,7 +142,7 @@ in {
               "PASSWORD_STORE_DIR" = "~/.password-store";
             }
           '';
-          description = lib.mdDoc ''
+          description = ''
             Extra environment variables to be exported in the service.
           '';
         };
@@ -153,7 +152,7 @@ in {
             type = with lib.types; nullOr str;
             default = null;
             example = "gmail";
-            description = lib.mdDoc ''
+            description = ''
               Name of the account the notifier should be started for. If
               no account is given, the default one is used.
             '';
@@ -163,7 +162,7 @@ in {
             type = with lib.types; nullOr int;
             default = null;
             example = "500";
-            description = lib.mdDoc ''
+            description = ''
               Notifier lifetime of the IDLE session (in seconds). 
             '';
           };
@@ -171,8 +170,8 @@ in {
       };
 
       himalaya-watch = {
-        enable = lib.mkEnableOption
-          (lib.mdDoc "the Himalaya folder changes watcher service");
+        enable =
+          lib.mkEnableOption "the Himalaya folder changes watcher service";
 
         environment = lib.mkOption {
           type = with lib.types; attrsOf str;
@@ -182,7 +181,7 @@ in {
               "PASSWORD_STORE_DIR" = "~/.password-store";
             }
           '';
-          description = lib.mdDoc ''
+          description = ''
             Extra environment variables to be exported in the service.
           '';
         };
@@ -192,7 +191,7 @@ in {
             type = with lib.types; nullOr str;
             default = null;
             example = "gmail";
-            description = lib.mdDoc ''
+            description = ''
               Name of the account the watcher should be started for. If
               no account is given, the default one is used.
             '';
@@ -202,7 +201,7 @@ in {
             type = with lib.types; nullOr int;
             default = null;
             example = "500";
-            description = lib.mdDoc ''
+            description = ''
               Watcher lifetime of the IDLE session (in seconds). 
             '';
           };
@@ -213,14 +212,13 @@ in {
     accounts.email.accounts = lib.mkOption {
       type = lib.types.attrsOf (lib.types.submodule {
         options.himalaya = {
-          enable =
-            lib.mkEnableOption (lib.mdDoc "Himalaya for this email account");
+          enable = lib.mkEnableOption "Himalaya for this email account";
 
           # TODO: remove me for the next release
           backend = lib.mkOption {
             type = with lib.types; nullOr str;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               Specifying {option}`accounts.email.accounts.*.himalaya.backend` is deprecated,
               set {option}`accounts.email.accounts.*.himalaya.settings.backend` instead.
             '';
@@ -229,7 +227,7 @@ in {
           # TODO: remove me for the next release
           sender = lib.mkOption {
             type = with lib.types; nullOr str;
-            description = lib.mdDoc ''
+            description = ''
               Specifying {option}`accounts.email.accounts.*.himalaya.sender` is deprecated,
               set {option}'accounts.email.accounts.*.himalaya.settings.sender' instead.
             '';
@@ -238,7 +236,7 @@ in {
           settings = lib.mkOption {
             type = lib.types.submodule { freeformType = tomlFormat.type; };
             default = { };
-            description = lib.mdDoc ''
+            description = ''
               Himalaya configuration for this email account.
               See <https://pimalaya.org/himalaya/cli/configuration/account.html> for supported values.
             '';
diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager.nix
index 717d02c1d..8ea370175 100644
--- a/modules/programs/home-manager.nix
+++ b/modules/programs/home-manager.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     programs.home-manager = {
-      enable = mkEnableOption (lib.mdDoc "Home Manager");
+      enable = mkEnableOption "Home Manager";
 
       path = mkOption {
         type = types.nullOr types.str;
         default = null;
         example = "$HOME/devel/home-manager";
-        description = lib.mdDoc ''
+        description = ''
           The default path to use for Home Manager. When
           `null`, then the {file}`home-manager`
           channel, {file}`$HOME/.config/nixpkgs/home-manager`, and
diff --git a/modules/programs/hstr.nix b/modules/programs/hstr.nix
index cb580f7bb..e85832174 100644
--- a/modules/programs/hstr.nix
+++ b/modules/programs/hstr.nix
@@ -10,17 +10,17 @@ in {
   meta.maintainers = [ hm.maintainers.Dines97 ];
 
   options.programs.hstr = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       Bash And Zsh shell history suggest box - easily view, navigate, search and
-      manage your command history'');
+      manage your command history'';
 
-    package = mkPackageOptionMD pkgs "hstr" { };
+    package = mkPackageOption pkgs "hstr" { };
 
-    enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+    enableBashIntegration = mkEnableOption "Bash integration" // {
       default = true;
     };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
       default = true;
     };
   };
diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix
index 0b1773eab..1c569c404 100644
--- a/modules/programs/htop.nix
+++ b/modules/programs/htop.nix
@@ -110,7 +110,7 @@ in {
   meta.maintainers = [ hm.maintainers.bjpbakker ];
 
   options.programs.htop = {
-    enable = mkEnableOption (lib.mdDoc "htop");
+    enable = mkEnableOption "htop";
 
     settings = mkOption {
       type = types.attrs;
@@ -149,7 +149,7 @@ in {
           (text "Systemd")
         ]);
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration options to add to
         {file}`$XDG_CONFIG_HOME/htop/htoprc`.
       '';
@@ -159,7 +159,7 @@ in {
       type = types.package;
       default = pkgs.htop;
       defaultText = literalExpression "pkgs.htop";
-      description = lib.mdDoc "Package containing the {command}`htop` program.";
+      description = "Package containing the {command}`htop` program.";
     };
   };
 
diff --git a/modules/programs/hyfetch.nix b/modules/programs/hyfetch.nix
index a8d63b9ab..726bc94e6 100644
--- a/modules/programs/hyfetch.nix
+++ b/modules/programs/hyfetch.nix
@@ -10,13 +10,13 @@ in {
   meta.maintainers = [ maintainers.lilyinstarlight ];
 
   options.programs.hyfetch = {
-    enable = mkEnableOption (lib.mdDoc "hyfetch");
+    enable = mkEnableOption "hyfetch";
 
     package = mkOption {
       type = types.package;
       default = pkgs.hyfetch;
       defaultText = literalExpression "pkgs.hyfetch";
-      description = lib.mdDoc "The hyfetch package to use.";
+      description = "The hyfetch package to use.";
     };
 
     settings = mkOption {
@@ -31,7 +31,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc "JSON config for HyFetch";
+      description = "JSON config for HyFetch";
     };
   };
 
diff --git a/modules/programs/i3status-rust.nix b/modules/programs/i3status-rust.nix
index b729f147c..c5c020cb4 100644
--- a/modules/programs/i3status-rust.nix
+++ b/modules/programs/i3status-rust.nix
@@ -12,8 +12,7 @@ in {
   meta.maintainers = with lib.maintainers; [ farlion thiagokokada ];
 
   options.programs.i3status-rust = {
-    enable =
-      mkEnableOption (lib.mdDoc "a replacement for i3-status written in Rust");
+    enable = mkEnableOption "a replacement for i3-status written in Rust";
 
     bars = mkOption {
       type = types.attrsOf (types.submodule {
@@ -50,7 +49,7 @@ in {
                 format = " $timestamp.datetime(f:'%a %d/%m %R') ";
               }
             ];
-            description = lib.mdDoc ''
+            description = ''
               Configuration blocks to add to i3status-rust
               {file}`config`. See
               <https://github.com/greshake/i3status-rust/blob/master/blocks.md>
@@ -87,7 +86,7 @@ in {
           settings = mkOption {
             type = settingsFormat.type;
             default = { };
-            description = lib.mdDoc ''
+            description = ''
               Any extra options to add to i3status-rust
               {file}`config`.
             '';
@@ -107,7 +106,7 @@ in {
           icons = mkOption {
             type = types.str;
             default = "none";
-            description = lib.mdDoc ''
+            description = ''
               The icons set to use. See
               <https://github.com/greshake/i3status-rust/blob/master/doc/themes.md>
               for a list of available icon sets.
@@ -118,7 +117,7 @@ in {
           theme = mkOption {
             type = types.str;
             default = "plain";
-            description = lib.mdDoc ''
+            description = ''
               The theme to use. See
               <https://github.com/greshake/i3status-rust/blob/master/doc/themes.md>
               for a list of available themes.
@@ -162,7 +161,7 @@ in {
           ];
         };
       };
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of i3status-rust bars, each with their own configuration.
         Each bar {var}`name` generates a config file suffixed with
         the bar's {var}`name` from the attribute set, like so:
@@ -226,7 +225,7 @@ in {
       type = types.package;
       default = pkgs.i3status-rust;
       defaultText = literalExpression "pkgs.i3status-rust";
-      description = lib.mdDoc "Package providing i3status-rust";
+      description = "Package providing i3status-rust";
     };
 
   };
diff --git a/modules/programs/i3status.nix b/modules/programs/i3status.nix
index 34f8d1c02..17b1162e8 100644
--- a/modules/programs/i3status.nix
+++ b/modules/programs/i3status.nix
@@ -36,12 +36,12 @@ in {
   meta.maintainers = [ hm.maintainers.justinlovinger ];
 
   options.programs.i3status = {
-    enable = mkEnableOption (lib.mdDoc "i3status");
+    enable = mkEnableOption "i3status";
 
     enableDefault = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether or not to enable
         the default configuration.
       '';
@@ -50,7 +50,7 @@ in {
     general = mkOption {
       type = settingsType;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration to add to i3status {file}`config`
         `general` section.
         See
@@ -74,20 +74,20 @@ in {
           enable = mkOption {
             type = types.bool;
             default = true;
-            description = lib.mdDoc ''
+            description = ''
               Whether or not to enable this module.
             '';
           };
           position = mkOption {
             type = with types; either int float;
-            description = lib.mdDoc ''
+            description = ''
               Position of this module in i3status `order`.
             '';
           };
           settings = mkOption {
             type = settingsType;
             default = { };
-            description = lib.mdDoc ''
+            description = ''
               Configuration to add to this i3status module.
               See
               {manpage}`i3status(1)`
@@ -104,7 +104,7 @@ in {
         };
       });
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Modules to add to i3status {file}`config` file.
         See
         {manpage}`i3status(1)`
@@ -130,7 +130,7 @@ in {
       '';
     };
 
-    package = mkPackageOptionMD pkgs "i3status" { };
+    package = mkPackageOption pkgs "i3status" { };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/imv.nix b/modules/programs/imv.nix
index 96c22e25a..583c2c57c 100644
--- a/modules/programs/imv.nix
+++ b/modules/programs/imv.nix
@@ -13,15 +13,15 @@ in {
   meta.maintainers = [ maintainers.christoph-heiss ];
 
   options.programs.imv = {
-    enable = mkEnableOption (lib.mdDoc
-      "imv: a command line image viewer intended for use with tiling window managers");
+    enable = mkEnableOption
+      "imv: a command line image viewer intended for use with tiling window managers";
 
-    package = mkPackageOptionMD pkgs "imv" { };
+    package = mkPackageOption pkgs "imv" { };
 
     settings = mkOption {
       default = { };
       type = with types; attrsOf (attrsOf (oneOf [ bool int str ]));
-      description = lib.mdDoc ''
+      description = ''
         Configuration options for imv. See
         {manpage}`imv(5)`.
       '';
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index 79aabc909..a7d2692b5 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -38,7 +38,7 @@ in {
     '')
   ];
 
-  options.programs.info.enable = mkEnableOption (lib.mdDoc "GNU Info");
+  options.programs.info.enable = mkEnableOption "GNU Info";
 
   config = mkIf cfg.enable {
     home.packages = [
diff --git a/modules/programs/ion.nix b/modules/programs/ion.nix
index 328e643a1..0bda85c01 100644
--- a/modules/programs/ion.nix
+++ b/modules/programs/ion.nix
@@ -12,14 +12,13 @@ in {
   meta.maintainers = [ maintainers.jo1gi ];
 
   options.programs.ion = {
-    enable = mkEnableOption
-      (lib.mdDoc "the Ion Shell. Compatible with Redox and Linux");
+    enable = mkEnableOption "the Ion Shell. Compatible with Redox and Linux";
 
     package = mkOption {
       type = types.package;
       default = pkgs.ion;
       defaultText = literalExpression "pkgs.ion";
-      description = lib.mdDoc ''
+      description = ''
         The ion package to install. May be used to change the version.
       '';
     };
@@ -27,7 +26,7 @@ in {
     initExtra = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Ion script which is called during ion initialization.
       '';
     };
@@ -40,7 +39,7 @@ in {
           g = "git";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         An attribute set that maps aliases (the top level attribute names
         in this option) to command strings or directly to build outputs.
       '';
diff --git a/modules/programs/irssi.nix b/modules/programs/irssi.nix
index 5faa84cb1..bcce6cfa5 100644
--- a/modules/programs/irssi.nix
+++ b/modules/programs/irssi.nix
@@ -64,13 +64,13 @@ let
         type = types.nullOr types.str;
         visible = false;
         default = null;
-        description = lib.mdDoc "Name of the channel.";
+        description = "Name of the channel.";
       };
 
       autoJoin = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Whether to join this channel on connect.";
+        description = "Whether to join this channel on connect.";
       };
     };
   };
@@ -85,51 +85,50 @@ let
 
       nick = mkOption {
         type = types.str;
-        description = lib.mdDoc "Nickname in that network.";
+        description = "Nickname in that network.";
       };
 
       type = mkOption {
         type = types.str;
-        description = lib.mdDoc "Type of the network.";
+        description = "Type of the network.";
         default = "IRC";
       };
 
       autoCommands = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc "List of commands to execute on connect.";
+        description = "List of commands to execute on connect.";
       };
 
       server = {
         address = mkOption {
           type = types.str;
-          description = lib.mdDoc "Address of the chat server.";
+          description = "Address of the chat server.";
         };
 
         port = mkOption {
           type = types.port;
           default = 6667;
-          description = lib.mdDoc "Port of the chat server.";
+          description = "Port of the chat server.";
         };
 
         ssl = {
           enable = mkOption {
             type = types.bool;
             default = true;
-            description = lib.mdDoc "Whether SSL should be used.";
+            description = "Whether SSL should be used.";
           };
 
           verify = mkOption {
             type = types.bool;
             default = true;
-            description =
-              lib.mdDoc "Whether the SSL certificate should be verified.";
+            description = "Whether the SSL certificate should be verified.";
           };
 
           certificateFile = mkOption {
             type = types.nullOr types.path;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               Path to a file containing the certificate used for
               client authentication to the server.
             '';
@@ -139,13 +138,12 @@ let
         autoConnect = mkOption {
           type = types.bool;
           default = false;
-          description =
-            lib.mdDoc "Whether Irssi connects to the server on launch.";
+          description = "Whether Irssi connects to the server on launch.";
         };
       };
 
       channels = mkOption {
-        description = lib.mdDoc "Channels for the given network.";
+        description = "Channels for the given network.";
         type = types.attrsOf channelType;
         default = { };
       };
@@ -153,7 +151,7 @@ let
       saslExternal = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Enable SASL external authentication. This requires setting a path in
           [](#opt-programs.irssi.networks._name_.server.ssl.certificateFile).
         '';
@@ -165,12 +163,11 @@ in {
 
   options = {
     programs.irssi = {
-      enable = mkEnableOption (lib.mdDoc "the Irssi chat client");
+      enable = mkEnableOption "the Irssi chat client";
 
       extraConfig = mkOption {
         default = "";
-        description =
-          lib.mdDoc "These lines are appended to the Irssi configuration.";
+        description = "These lines are appended to the Irssi configuration.";
         type = types.lines;
       };
 
@@ -180,8 +177,7 @@ in {
           J = "join";
           BYE = "quit";
         };
-        description =
-          lib.mdDoc "An attribute set that maps aliases to commands.";
+        description = "An attribute set that maps aliases to commands.";
         type = types.attrsOf types.str;
       };
 
@@ -202,7 +198,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc "An attribute set of chat networks.";
+        description = "An attribute set of chat networks.";
         type = types.attrsOf networkType;
       };
     };
diff --git a/modules/programs/java.nix b/modules/programs/java.nix
index 22755dd3e..115a8a9e5 100644
--- a/modules/programs/java.nix
+++ b/modules/programs/java.nix
@@ -14,8 +14,8 @@ in {
 
   options = {
     programs.java = {
-      enable = mkEnableOption (lib.mdDoc "") // {
-        description = lib.mdDoc ''
+      enable = mkEnableOption "" // {
+        description = ''
           Install the Java development kit and set the
           {env}`JAVA_HOME` variable.
         '';
@@ -25,7 +25,7 @@ in {
         type = types.package;
         default = pkgs.jdk;
         defaultText = "pkgs.jdk";
-        description = lib.mdDoc ''
+        description = ''
           Java package to install. Typical values are
           `pkgs.jdk` or `pkgs.jre`.
         '';
diff --git a/modules/programs/joshuto.nix b/modules/programs/joshuto.nix
index 82132db5d..6f87277d4 100644
--- a/modules/programs/joshuto.nix
+++ b/modules/programs/joshuto.nix
@@ -9,19 +9,19 @@ in {
   meta.maintainers = [ hm.maintainers.rasmus-kirk ];
 
   options.programs.joshuto = {
-    enable = mkEnableOption (lib.mdDoc "joshuto file manager");
+    enable = mkEnableOption "joshuto file manager";
 
     package = mkOption {
       type = types.package;
       default = pkgs.joshuto;
       defaultText = literalExpression "pkgs.joshuto";
-      description = lib.mdDoc "The package to use for joshuto.";
+      description = "The package to use for joshuto.";
     };
 
     settings = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/joshuto/joshuto.toml`.
 
@@ -33,7 +33,7 @@ in {
     keymap = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/joshuto/keymap.toml`.
 
@@ -45,7 +45,7 @@ in {
     mimetype = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/joshuto/mimetype.toml`.
 
@@ -57,7 +57,7 @@ in {
     theme = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/joshuto/theme.toml`.
 
diff --git a/modules/programs/jq.nix b/modules/programs/jq.nix
index b76832193..f4ec5334d 100644
--- a/modules/programs/jq.nix
+++ b/modules/programs/jq.nix
@@ -8,7 +8,7 @@ let
 
   colorType = mkOption {
     type = types.str;
-    description = lib.mdDoc "ANSI color definition";
+    description = "ANSI color definition";
     example = "1;31";
     visible = false;
   };
@@ -28,17 +28,17 @@ let
 in {
   options = {
     programs.jq = {
-      enable = mkEnableOption (lib.mdDoc "the jq command-line JSON processor");
+      enable = mkEnableOption "the jq command-line JSON processor";
 
       package = mkOption {
         type = types.package;
         default = pkgs.jq;
         defaultText = literalExpression "pkgs.jq";
-        description = lib.mdDoc "jq package to use.";
+        description = "jq package to use.";
       };
 
       colors = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           The colors used in colored JSON output.
 
           See the [Colors section](https://jqlang.github.io/jq/manual/#Colors)
diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu.nix
index 39406ef57..aca235505 100644
--- a/modules/programs/jujutsu.nix
+++ b/modules/programs/jujutsu.nix
@@ -11,10 +11,10 @@ in {
   meta.maintainers = [ maintainers.shikanime ];
 
   options.programs.jujutsu = {
-    enable = mkEnableOption
-      (lib.mdDoc "a Git-compatible DVCS that is both simple and powerful");
+    enable =
+      mkEnableOption "a Git-compatible DVCS that is both simple and powerful";
 
-    package = mkPackageOptionMD pkgs "jujutsu" { };
+    package = mkPackageOption pkgs "jujutsu" { };
 
     settings = mkOption {
       type = tomlFormat.type;
@@ -27,7 +27,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Options to add to the {file}`.jjconfig.toml` file. See
         <https://github.com/martinvonz/jj/blob/main/docs/config.md>
         for options.
@@ -37,19 +37,19 @@ in {
     enableBashIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc "Whether to enable Bash integration.";
+      description = "Whether to enable Bash integration.";
     };
 
     enableZshIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc "Whether to enable Zsh integration.";
+      description = "Whether to enable Zsh integration.";
     };
 
     enableFishIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc "Whether to enable Fish integration.";
+      description = "Whether to enable Fish integration.";
     };
   };
 
diff --git a/modules/programs/k9s.nix b/modules/programs/k9s.nix
index 114e8a1f0..b32769cc0 100644
--- a/modules/programs/k9s.nix
+++ b/modules/programs/k9s.nix
@@ -11,15 +11,15 @@ in {
   meta.maintainers = [ hm.maintainers.katexochen ];
 
   options.programs.k9s = {
-    enable = mkEnableOption
-      (lib.mdDoc "k9s - Kubernetes CLI To Manage Your Clusters In Style");
+    enable =
+      mkEnableOption "k9s - Kubernetes CLI To Manage Your Clusters In Style";
 
-    package = mkPackageOptionMD pkgs "k9s" { };
+    package = mkPackageOption pkgs "k9s" { };
 
     settings = mkOption {
       type = yamlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/k9s/config.yml`. See
         <https://k9scli.io/topics/config/>
@@ -35,7 +35,7 @@ in {
     skin = mkOption {
       type = yamlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Skin written to
         {file}`$XDG_CONFIG_HOME/k9s/skin.yml`. See
         <https://k9scli.io/topics/skins/>
diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix
index 77503dc06..da0af0c06 100644
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@@ -51,7 +51,7 @@ let
           "User"
         ];
         example = "SetOption";
-        description = lib.mdDoc ''
+        description = ''
           The name of the hook. For a description, see
           <https://github.com/mawww/kakoune/blob/master/doc/pages/hooks.asciidoc#default-hooks>.
         '';
@@ -60,7 +60,7 @@ let
       once = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Remove the hook after running it once.
         '';
       };
@@ -68,7 +68,7 @@ let
       group = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Add the hook to the named group.
         '';
       };
@@ -77,7 +77,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "filetype=latex";
-        description = lib.mdDoc ''
+        description = ''
           Additional option to pass to the hook.
         '';
       };
@@ -86,7 +86,7 @@ let
         type = types.lines;
         default = "";
         example = "set-option window indentwidth 2";
-        description = lib.mdDoc ''
+        description = ''
           Commands to run when the hook is activated.
         '';
       };
@@ -98,7 +98,7 @@ let
       mode = mkOption {
         type = types.str;
         example = "user";
-        description = lib.mdDoc ''
+        description = ''
           The mode in which the mapping takes effect.
         '';
       };
@@ -106,7 +106,7 @@ let
       docstring = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Optional documentation text to display in info boxes.
         '';
       };
@@ -114,7 +114,7 @@ let
       key = mkOption {
         type = types.str;
         example = "<a-x>";
-        description = lib.mdDoc ''
+        description = ''
           The key to be mapped. See
           <https://github.com/mawww/kakoune/blob/master/doc/pages/mapping.asciidoc#mappable-keys>
           for possible values.
@@ -124,7 +124,7 @@ let
       effect = mkOption {
         type = types.str;
         example = ":wq<ret>";
-        description = lib.mdDoc ''
+        description = ''
           The sequence of keys to be mapped.
         '';
       };
@@ -136,7 +136,7 @@ let
       colorScheme = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Set the color scheme. To see available schemes, enter
           {command}`colorscheme` at the kakoune prompt.
         '';
@@ -145,7 +145,7 @@ let
       tabStop = mkOption {
         type = types.nullOr types.ints.unsigned;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The width of a tab in spaces. The kakoune default is
           `6`.
         '';
@@ -154,7 +154,7 @@ let
       indentWidth = mkOption {
         type = types.nullOr types.ints.unsigned;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The width of an indentation in spaces.
           The kakoune default is `4`.
           If `0`, a tab will be used instead.
@@ -164,7 +164,7 @@ let
       incrementalSearch = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Execute a search as it is being typed.
         '';
       };
@@ -172,7 +172,7 @@ let
       alignWithTabs = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Use tabs for the align command.
         '';
       };
@@ -182,7 +182,7 @@ let
           (types.listOf (types.enum [ "command" "onkey" "normal" ]));
         default = null;
         example = [ "command" "normal" ];
-        description = lib.mdDoc ''
+        description = ''
           Contexts in which to display automatic information box.
           The kakoune default is `[ "command" "onkey" ]`.
         '';
@@ -191,7 +191,7 @@ let
       autoComplete = mkOption {
         type = types.nullOr (types.listOf (types.enum [ "insert" "prompt" ]));
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Modes in which to display possible completions.
           The kakoune default is `[ "insert" "prompt" ]`.
         '';
@@ -200,7 +200,7 @@ let
       autoReload = mkOption {
         type = types.nullOr (types.enum [ "yes" "no" "ask" ]);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Reload buffers when an external modification is detected.
           The kakoune default is `"ask"`.
         '';
@@ -212,7 +212,7 @@ let
             lines = mkOption {
               type = types.ints.unsigned;
               default = 0;
-              description = lib.mdDoc ''
+              description = ''
                 The number of lines to keep visible around the cursor.
               '';
             };
@@ -220,14 +220,14 @@ let
             columns = mkOption {
               type = types.ints.unsigned;
               default = 0;
-              description = lib.mdDoc ''
+              description = ''
                 The number of columns to keep visible around the cursor.
               '';
             };
           };
         });
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           How many lines and columns to keep visible around the cursor.
         '';
       };
@@ -238,7 +238,7 @@ let
             setTitle = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Change the title of the terminal emulator.
               '';
             };
@@ -246,7 +246,7 @@ let
             statusLine = mkOption {
               type = types.enum [ "top" "bottom" ];
               default = "bottom";
-              description = lib.mdDoc ''
+              description = ''
                 Where to display the status line.
               '';
             };
@@ -254,7 +254,7 @@ let
             assistant = mkOption {
               type = types.enum [ "clippy" "cat" "dilbert" "none" ];
               default = "clippy";
-              description = lib.mdDoc ''
+              description = ''
                 The assistant displayed in info boxes.
               '';
             };
@@ -262,7 +262,7 @@ let
             enableMouse = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Whether to enable mouse support.
               '';
             };
@@ -270,7 +270,7 @@ let
             changeColors = mkOption {
               type = types.bool;
               default = true;
-              description = lib.mdDoc ''
+              description = ''
                 Change color palette.
               '';
             };
@@ -278,7 +278,7 @@ let
             wheelDownButton = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 Button to send for wheel down events.
               '';
             };
@@ -286,7 +286,7 @@ let
             wheelUpButton = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 Button to send for wheel up events.
               '';
             };
@@ -294,7 +294,7 @@ let
             shiftFunctionKeys = mkOption {
               type = types.nullOr types.ints.unsigned;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 Amount by which shifted function keys are offset. That
                 is, if the terminal sends F13 for Shift-F1, this
                 should be `12`.
@@ -304,14 +304,14 @@ let
             useBuiltinKeyParser = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Bypass ncurses key parser and use an internal one.
               '';
             };
           };
         });
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Settings for the ncurses interface.
         '';
       };
@@ -319,7 +319,7 @@ let
       showMatching = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Highlight the matching char of the character under the
           selections' cursor using the `MatchingChar`
           face.
@@ -329,12 +329,12 @@ let
       wrapLines = mkOption {
         type = types.nullOr (types.submodule {
           options = {
-            enable = mkEnableOption (lib.mdDoc "the wrap lines highlighter");
+            enable = mkEnableOption "the wrap lines highlighter";
 
             word = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Wrap at word boundaries instead of codepoint boundaries.
               '';
             };
@@ -342,7 +342,7 @@ let
             indent = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Preserve line indentation when wrapping.
               '';
             };
@@ -350,7 +350,7 @@ let
             maxWidth = mkOption {
               type = types.nullOr types.ints.unsigned;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 Wrap text at maxWidth, even if the window is wider.
               '';
             };
@@ -359,7 +359,7 @@ let
               type = types.nullOr types.str;
               default = null;
               example = "⏎";
-              description = lib.mdDoc ''
+              description = ''
                 Prefix wrapped lines with marker text.
                 If not `null`,
                 the marker text will be displayed in the indentation if possible.
@@ -368,7 +368,7 @@ let
           };
         });
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Settings for the wrap lines highlighter.
         '';
       };
@@ -376,12 +376,12 @@ let
       numberLines = mkOption {
         type = types.nullOr (types.submodule {
           options = {
-            enable = mkEnableOption (lib.mdDoc "the number lines highlighter");
+            enable = mkEnableOption "the number lines highlighter";
 
             relative = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Show line numbers relative to the main cursor line.
               '';
             };
@@ -389,7 +389,7 @@ let
             highlightCursor = mkOption {
               type = types.bool;
               default = false;
-              description = lib.mdDoc ''
+              description = ''
                 Highlight the cursor line with a separate face.
               '';
             };
@@ -397,7 +397,7 @@ let
             separator = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 String that separates the line number column from the
                 buffer contents. The kakoune default is
                 `"|"`.
@@ -406,7 +406,7 @@ let
           };
         });
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Settings for the number lines highlighter.
         '';
       };
@@ -414,13 +414,12 @@ let
       showWhitespace = mkOption {
         type = types.nullOr (types.submodule {
           options = {
-            enable =
-              mkEnableOption (lib.mdDoc "the show whitespace highlighter");
+            enable = mkEnableOption "the show whitespace highlighter";
 
             lineFeed = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 The character to display for line feeds.
                 The kakoune default is `"¬"`.
               '';
@@ -429,7 +428,7 @@ let
             space = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 The character to display for spaces.
                 The kakoune default is `"·"`.
               '';
@@ -438,7 +437,7 @@ let
             nonBreakingSpace = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 The character to display for non-breaking spaces.
                 The kakoune default is `"⍽"`.
               '';
@@ -447,7 +446,7 @@ let
             tab = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 The character to display for tabs.
                 The kakoune default is `"→"`.
               '';
@@ -456,7 +455,7 @@ let
             tabStop = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc ''
+              description = ''
                 The character to append to tabs to reach the width of a tabstop.
                 The kakoune default is `" "`.
               '';
@@ -464,7 +463,7 @@ let
           };
         });
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Settings for the show whitespaces highlighter.
         '';
       };
@@ -472,7 +471,7 @@ let
       keyMappings = mkOption {
         type = types.listOf keyMapping;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           User-defined key mappings. For documentation, see
           <https://github.com/mawww/kakoune/blob/master/doc/pages/mapping.asciidoc>.
         '';
@@ -481,7 +480,7 @@ let
       hooks = mkOption {
         type = types.listOf hook;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           Global hooks. For documentation, see
           <https://github.com/mawww/kakoune/blob/master/doc/pages/hooks.asciidoc>.
         '';
@@ -621,20 +620,20 @@ let
 in {
   options = {
     programs.kakoune = {
-      enable = mkEnableOption (lib.mdDoc "the kakoune text editor");
+      enable = mkEnableOption "the kakoune text editor";
 
-      package = mkPackageOptionMD pkgs "kakoune-unwrapped" { };
+      package = mkPackageOption pkgs "kakoune-unwrapped" { };
 
       config = mkOption {
         type = types.nullOr configModule;
         default = { };
-        description = lib.mdDoc "kakoune configuration options.";
+        description = "kakoune configuration options.";
       };
 
       defaultEditor = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to configure {command}`kak` as the default
           editor using the {env}`EDITOR` environment variable.
         '';
@@ -643,7 +642,7 @@ in {
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration lines to add to
           {file}`$XDG_CONFIG_HOME/kak/kakrc`.
         '';
@@ -653,7 +652,7 @@ in {
         type = with types; listOf package;
         default = [ ];
         example = literalExpression "[ pkgs.kakounePlugins.kak-fzf ]";
-        description = lib.mdDoc ''
+        description = ''
           List of kakoune plugins to install. To get a list of
           supported plugins run:
           {command}`nix-env -f '<nixpkgs>' -qaP -A kakounePlugins`.
diff --git a/modules/programs/keychain.nix b/modules/programs/keychain.nix
index 74a53c9bb..d59855f55 100644
--- a/modules/programs/keychain.nix
+++ b/modules/programs/keychain.nix
@@ -19,13 +19,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.keychain = {
-    enable = mkEnableOption (lib.mdDoc "keychain");
+    enable = mkEnableOption "keychain";
 
     package = mkOption {
       type = types.package;
       default = pkgs.keychain;
       defaultText = literalExpression "pkgs.keychain";
-      description = lib.mdDoc ''
+      description = ''
         Keychain package to install.
       '';
     };
@@ -33,7 +33,7 @@ in {
     keys = mkOption {
       type = types.listOf types.str;
       default = [ "id_rsa" ];
-      description = lib.mdDoc ''
+      description = ''
         Keys to add to keychain.
       '';
     };
@@ -41,7 +41,7 @@ in {
     agents = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         Agents to add.
       '';
     };
@@ -50,7 +50,7 @@ in {
       type =
         types.nullOr (types.enum [ "local" "any" "local-once" "any-once" ]);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Inherit type to attempt from agent variables from the environment.
       '';
     };
@@ -58,7 +58,7 @@ in {
     extraFlags = mkOption {
       type = types.listOf types.str;
       default = [ "--quiet" ];
-      description = lib.mdDoc ''
+      description = ''
         Extra flags to pass to keychain.
       '';
     };
@@ -66,7 +66,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -74,7 +74,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
@@ -82,7 +82,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -90,7 +90,7 @@ in {
     enableNushellIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Nushell integration.
       '';
     };
@@ -99,7 +99,7 @@ in {
       default = true;
       type = types.bool;
       visible = pkgs.stdenv.hostPlatform.isLinux;
-      description = lib.mdDoc ''
+      description = ''
         Whether to run keychain from your {file}`~/.xsession`.
       '';
     };
diff --git a/modules/programs/khal-accounts.nix b/modules/programs/khal-accounts.nix
index dde7fb195..ad94adc99 100644
--- a/modules/programs/khal-accounts.nix
+++ b/modules/programs/khal-accounts.nix
@@ -4,12 +4,12 @@ with lib;
 
 {
   options.khal = {
-    enable = lib.mkEnableOption (lib.mdDoc "khal access");
+    enable = lib.mkEnableOption "khal access";
 
     readOnly = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Keep khal from making any changes to this account.
       '';
     };
diff --git a/modules/programs/khal-calendar-accounts.nix b/modules/programs/khal-calendar-accounts.nix
index e10a8fd58..6910d627a 100644
--- a/modules/programs/khal-calendar-accounts.nix
+++ b/modules/programs/khal-calendar-accounts.nix
@@ -7,7 +7,7 @@ with lib;
     type = mkOption {
       type = types.nullOr (types.enum [ "calendar" "discover" ]);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Either a single calendar (calendar which is the default) or a directory with multiple calendars (discover).
       '';
     };
@@ -15,7 +15,7 @@ with lib;
     glob = mkOption {
       type = types.str;
       default = "*";
-      description = lib.mdDoc ''
+      description = ''
         The glob expansion to be searched for events or birthdays when
         type is set to discover.
       '';
@@ -41,7 +41,7 @@ with lib;
         "light red"
       ]);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Color in which events in this calendar are displayed.
       '';
       example = "light green";
@@ -50,7 +50,7 @@ with lib;
     priority = mkOption {
       type = types.int;
       default = 10;
-      description = lib.mdDoc ''
+      description = ''
         Priority of a calendar used for coloring.
       '';
     };
diff --git a/modules/programs/khal.nix b/modules/programs/khal.nix
index 57467c89d..42720620e 100644
--- a/modules/programs/khal.nix
+++ b/modules/programs/khal.nix
@@ -43,7 +43,7 @@ let
     dateformat = mkOption {
       type = T.str;
       default = "%x";
-      description = lib.mdDoc ''
+      description = ''
         khal will display and understand all dates in this format.
 
         ${suffix}
@@ -53,7 +53,7 @@ let
     timeformat = mkOption {
       type = T.str;
       default = "%X";
-      description = lib.mdDoc ''
+      description = ''
         khal will display and understand all times in this format.
 
         ${suffix}
@@ -63,7 +63,7 @@ let
     datetimeformat = mkOption {
       type = T.str;
       default = "%c";
-      description = lib.mdDoc ''
+      description = ''
         khal will display and understand all datetimes in this format.
 
         ${suffix}
@@ -73,7 +73,7 @@ let
     longdateformat = mkOption {
       type = T.str;
       default = "%x";
-      description = lib.mdDoc ''
+      description = ''
         khal will display and understand all dates in this format.
         It should contain a year (e.g. `%Y`).
 
@@ -84,7 +84,7 @@ let
     longdatetimeformat = mkOption {
       type = T.str;
       default = "%c";
-      description = lib.mdDoc ''
+      description = ''
         khal will display and understand all datetimes in this format.
         It should contain a year (e.g. `%Y`).
 
@@ -98,7 +98,7 @@ let
     unicode_symbols = mkOption {
       type = T.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         By default khal uses some Unicode symbols (as in "non-ASCII") as
         indicators for things like repeating events.
         If your font, encoding etc. does not support those symbols, set this
@@ -109,7 +109,7 @@ let
     default_timezone = mkOption {
       type = T.nullOr T.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Default for new events or if khal does not understand the timezone
         in an ical file.
         If `null`, the timezone of your computer will be used.
@@ -119,7 +119,7 @@ let
     local_timezone = mkOption {
       type = T.nullOr T.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         khal will show all times in this timezone.
         If `null`, the timezone of your computer will be used.
       '';
@@ -128,7 +128,7 @@ let
     firstweekday = mkOption {
       type = T.ints.between 0 6;
       default = 0;
-      description = lib.mdDoc ''
+      description = ''
         The first day of the week, where Monday is 0 and Sunday is 6.
       '';
     };
@@ -136,7 +136,7 @@ let
     weeknumbers = mkOption {
       type = T.enum [ "off" "left" "right" ];
       default = "off";
-      description = lib.mdDoc ''
+      description = ''
         Enable week numbers in calendar and interactive (ikhal) mode.
         As those are ISO week numbers, they only work properly if
         {option}`firstweekday` is set to 0.
@@ -146,10 +146,10 @@ let
 
 in {
   options.programs.khal = {
-    enable = mkEnableOption (lib.mdDoc "khal, a CLI calendar application");
+    enable = mkEnableOption "khal, a CLI calendar application";
     locale = mkOption {
       type = lib.types.submodule { options = localeOptions; };
-      description = lib.mdDoc ''
+      description = ''
         khal locale settings. 
       '';
     };
diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index fe63cb32c..e010ba09f 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -55,13 +55,13 @@ let
   };
 in {
   options.programs.kitty = {
-    enable = mkEnableOption (lib.mdDoc "Kitty terminal emulator");
+    enable = mkEnableOption "Kitty terminal emulator";
 
     package = mkOption {
       type = types.package;
       default = pkgs.kitty;
       defaultText = literalExpression "pkgs.kitty";
-      description = lib.mdDoc ''
+      description = ''
         Kitty package to install.
       '';
     };
@@ -69,8 +69,7 @@ in {
     darwinLaunchOptions = mkOption {
       type = types.nullOr (types.listOf types.str);
       default = null;
-      description =
-        lib.mdDoc "Command-line options to use when launched by Mac OS GUI";
+      description = "Command-line options to use when launched by Mac OS GUI";
       example = literalExpression ''
         [
           "--single-instance"
@@ -90,7 +89,7 @@ in {
           update_check_interval = 0;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/kitty/kitty.conf`. See
         <https://sw.kovidgoyal.net/kitty/conf.html>
@@ -101,7 +100,7 @@ in {
     theme = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Apply a Kitty color theme. This option takes the friendly name of
         any theme given by the command {command}`kitty +kitten themes`.
         See <https://github.com/kovidgoyal/kitty-themes>
@@ -113,13 +112,13 @@ in {
     font = mkOption {
       type = types.nullOr hm.types.fontType;
       default = null;
-      description = lib.mdDoc "The font to use.";
+      description = "The font to use.";
     };
 
     keybindings = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc "Mapping of keybindings to actions.";
+      description = "Mapping of keybindings to actions.";
       example = literalExpression ''
         {
           "ctrl+c" = "copy_or_interrupt";
@@ -131,7 +130,7 @@ in {
     environment = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc "Environment variables to set or override.";
+      description = "Environment variables to set or override.";
       example = literalExpression ''
         {
           "LS_COLORS" = "1";
@@ -144,7 +143,7 @@ in {
         type = types.str;
         default = "enabled";
         example = "no-cursor";
-        description = lib.mdDoc ''
+        description = ''
           Set the mode of the shell integration. This accepts the same options
           as the `shell_integration` option of Kitty. Note that
           `no-rc` is always implied. See
@@ -153,23 +152,20 @@ in {
         '';
       };
 
-      enableBashIntegration =
-        mkEnableOption (lib.mdDoc "Kitty Bash integration")
+      enableBashIntegration = mkEnableOption "Kitty Bash integration"
         // shellIntegrationDefaultOpt;
 
-      enableFishIntegration =
-        mkEnableOption (lib.mdDoc "Kitty fish integration")
+      enableFishIntegration = mkEnableOption "Kitty fish integration"
         // shellIntegrationDefaultOpt;
 
-      enableZshIntegration =
-        mkEnableOption (lib.mdDoc "Kitty Z Shell integration")
+      enableZshIntegration = mkEnableOption "Kitty Z Shell integration"
         // shellIntegrationDefaultOpt;
     };
 
     extraConfig = mkOption {
       default = "";
       type = types.lines;
-      description = lib.mdDoc "Additional configuration to add.";
+      description = "Additional configuration to add.";
     };
   };
 
diff --git a/modules/programs/kodi.nix b/modules/programs/kodi.nix
index 91bd34485..f6776b9e4 100644
--- a/modules/programs/kodi.nix
+++ b/modules/programs/kodi.nix
@@ -125,7 +125,7 @@ in {
   meta.maintainers = [ hm.maintainers.dwagenk ];
 
   options.programs.kodi = {
-    enable = mkEnableOption (lib.mdDoc "Kodi");
+    enable = mkEnableOption "Kodi";
 
     package = mkOption {
       type = types.package;
@@ -133,7 +133,7 @@ in {
       defaultText = literalExpression "pkgs.kodi";
       example = literalExpression
         "pkgs.kodi.withPackages (exts: [ exts.pvr-iptvsimple ])";
-      description = lib.mdDoc ''
+      description = ''
         The `kodi` package to use.
         Can be used to specify extensions.
       '';
@@ -145,7 +145,7 @@ in {
       defaultText =
         literalExpression ''"''${config.home.homeDirectory}/.kodi"'';
       example = literalExpression ''"''${config.xdg.dataHome}/kodi"'';
-      description = lib.mdDoc "Directory to store configuration and metadata.";
+      description = "Directory to store configuration and metadata.";
     };
 
     settings = mkOption {
@@ -159,7 +159,7 @@ in {
       example = literalExpression ''
         { videolibrary.showemptytvshows = "true"; }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration to write to the `advancedsettings.xml`
         file in kodis userdata directory. Settings specified here will be
         immutable from inside kodi and be hidden from the GUI settings dialog.
@@ -190,7 +190,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Contents to populate the file `sources.xml` in kodis
         userdata directory.
 
@@ -211,7 +211,7 @@ in {
       example = literalExpression ''
         { "service.xbmc.versioncheck".versioncheck_enable = "false"; }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Attribute set with the plugin namespace as toplevel key and the plugins
         settings as lower level key/value pairs.
 
diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix
index 979163b5a..0102a22cc 100644
--- a/modules/programs/lazygit.nix
+++ b/modules/programs/lazygit.nix
@@ -14,10 +14,9 @@ in {
   meta.maintainers = [ hm.maintainers.kalhauge ];
 
   options.programs.lazygit = {
-    enable = mkEnableOption
-      (lib.mdDoc "lazygit, a simple terminal UI for git commands");
+    enable = mkEnableOption "lazygit, a simple terminal UI for git commands";
 
-    package = mkPackageOptionMD pkgs "lazygit" { };
+    package = mkPackageOption pkgs "lazygit" { };
 
     settings = mkOption {
       type = yamlFormat.type;
@@ -33,7 +32,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/lazygit/config.yml`
         on Linux or on Darwin if [](#opt-xdg.enable) is set, otherwise
diff --git a/modules/programs/ledger.nix b/modules/programs/ledger.nix
index 7fa3f2dd4..1b9178d15 100644
--- a/modules/programs/ledger.nix
+++ b/modules/programs/ledger.nix
@@ -19,10 +19,9 @@ in {
   meta.maintainers = [ ];
 
   options.programs.ledger = {
-    enable =
-      mkEnableOption (lib.mdDoc "ledger, a double-entry accounting system");
+    enable = mkEnableOption "ledger, a double-entry accounting system";
 
-    package = mkPackageOptionMD pkgs "ledger" { };
+    package = mkPackageOption pkgs "ledger" { };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
@@ -37,7 +36,7 @@ in {
           "~/finances/income.ledger"
         ];
       };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to {file}`$XDG_CONFIG_HOME/ledger/ledgerrc`.
         See <https://www.ledger-cli.org/3.0/doc/ledger3.html#Detailed-Option-Description>
         for explanation about possible values.
@@ -52,7 +51,7 @@ in {
         --effective
         --date-format %Y-%m-%d
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration to add to
         {file}`$XDG_CONFIG_HOME/ledger/ledgerrc`.
       '';
diff --git a/modules/programs/less.nix b/modules/programs/less.nix
index f63409ad7..7249f9bb7 100644
--- a/modules/programs/less.nix
+++ b/modules/programs/less.nix
@@ -8,7 +8,7 @@ in {
 
   options = {
     programs.less = {
-      enable = mkEnableOption (lib.mdDoc "less, opposite of more");
+      enable = mkEnableOption "less, opposite of more";
 
       keys = mkOption {
         type = types.lines;
@@ -17,7 +17,7 @@ in {
           s        back-line
           t        forw-line
         '';
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration for {command}`less` written to
           {file}`$XDG_CONFIG_HOME/lesskey`.
         '';
diff --git a/modules/programs/lesspipe.nix b/modules/programs/lesspipe.nix
index ce2cae427..a7a51ffe2 100644
--- a/modules/programs/lesspipe.nix
+++ b/modules/programs/lesspipe.nix
@@ -7,7 +7,7 @@ with lib;
 
   options = {
     programs.lesspipe = {
-      enable = mkEnableOption (lib.mdDoc "lesspipe preprocessor for less");
+      enable = mkEnableOption "lesspipe preprocessor for less";
     };
   };
 
diff --git a/modules/programs/lf.nix b/modules/programs/lf.nix
index 877d22f24..e7ad02744 100644
--- a/modules/programs/lf.nix
+++ b/modules/programs/lf.nix
@@ -56,13 +56,13 @@ in {
 
   options = {
     programs.lf = {
-      enable = mkEnableOption (lib.mdDoc "lf");
+      enable = mkEnableOption "lf";
 
       package = mkOption {
         type = types.package;
         default = pkgs.lf;
         defaultText = literalExpression "pkgs.lf";
-        description = lib.mdDoc ''
+        description = ''
           lf package to use.
         '';
       };
@@ -75,7 +75,7 @@ in {
           number = true;
           ratios = "1:1:2";
         };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set of lf settings. The attribute names and corresponding
           values must be among the following supported options.
 
@@ -99,7 +99,7 @@ in {
           get-mime-type = ''%xdg-mime query filetype "$f"'';
           open = "$$OPENER $f";
         };
-        description = lib.mdDoc ''
+        description = ''
           Commands to declare. Commands set to null or an empty string are
           deleted.
         '';
@@ -115,7 +115,7 @@ in {
           U = "!du -sh";
           gg = null;
         };
-        description = lib.mdDoc
+        description =
           "Keys to bind. Keys set to null or an empty string are deleted.";
       };
 
@@ -123,7 +123,7 @@ in {
         type = with types; attrsOf (nullOr str);
         default = { };
         example = literalExpression ''{ "<c-g>" = "cmd-escape"; }'';
-        description = lib.mdDoc ''
+        description = ''
           Keys to bind to command line commands which can only be one of the
           builtin commands. Keys set to null or an empty string are deleted.
         '';
@@ -146,7 +146,7 @@ in {
             esac
           '''
         '';
-        description = lib.mdDoc ''
+        description = ''
           Script or executable to use to preview files. Sets lf's
           {var}`previewer` option.
         '';
@@ -156,7 +156,7 @@ in {
         type = with types; nullOr str;
         default = null;
         example = "i";
-        description = lib.mdDoc ''
+        description = ''
           Key to bind to the script at {var}`previewer.source` and
           pipe through less. Setting to null will not bind any key.
         '';
@@ -168,7 +168,7 @@ in {
         example = ''
           $mkdir -p ~/.trash
         '';
-        description = lib.mdDoc "Custom lfrc lines.";
+        description = "Custom lfrc lines.";
       };
     };
   };
diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix
index 24be5dd45..d8b6dfabb 100644
--- a/modules/programs/librewolf.nix
+++ b/modules/programs/librewolf.nix
@@ -18,14 +18,14 @@ in {
   meta.maintainers = [ maintainers.onny ];
 
   options.programs.librewolf = {
-    enable = mkEnableOption
-      (lib.mdDoc "Librewolf browser, a privacy enhanced Firefox fork");
+    enable =
+      mkEnableOption "Librewolf browser, a privacy enhanced Firefox fork";
 
     package = mkOption {
       type = types.package;
       default = pkgs.librewolf;
       defaultText = literalExpression "pkgs.librewolf";
-      description = lib.mdDoc "The LibreWolf package to use.";
+      description = "The LibreWolf package to use.";
     };
 
     settings = mkOption {
@@ -37,7 +37,7 @@ in {
           "privacy.resistFingerprinting" = false;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of LibreWolf settings and overrides. Refer to
         <https://librewolf.net/docs/settings/>
         for details on supported values.
diff --git a/modules/programs/lieer.nix b/modules/programs/lieer.nix
index 1916a2629..80993f90a 100644
--- a/modules/programs/lieer.nix
+++ b/modules/programs/lieer.nix
@@ -35,7 +35,7 @@ let
     drop_non_existing_label = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Allow missing labels on the Gmail side to be dropped.
       '';
     };
@@ -44,7 +44,7 @@ let
       type = types.str;
       default = "";
       example = "mbox";
-      description = lib.mdDoc ''
+      description = ''
         Extension to include in local file names, which can be useful
         for indexing with third-party programs.
       '';
@@ -53,7 +53,7 @@ let
     ignore_empty_history = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Work around a Gmail API quirk where an empty change history
         is sometimes returned.
 
@@ -72,7 +72,7 @@ let
         "CATEGORY_SOCIAL"
         "CATEGORY_PERSONAL"
       ];
-      description = lib.mdDoc ''
+      description = ''
         Set Gmail labels to ignore when syncing from remote labels to
         local tags (before translations).
       '';
@@ -81,7 +81,7 @@ let
     ignore_tags = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         Set labels to ignore when syncing from local tags to
         remote labels (after translations).
       '';
@@ -90,7 +90,7 @@ let
     local_trash_tag = mkOption {
       type = types.str;
       default = "trash";
-      description = lib.mdDoc ''
+      description = ''
         Local tag to which the remote Gmail 'TRASH' label is translated.
       '';
     };
@@ -98,7 +98,7 @@ let
     remove_local_messages = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Remove local messages that have been deleted on the remote.
       '';
     };
@@ -106,7 +106,7 @@ let
     replace_slash_with_dot = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Replace '/' with '.' in Gmail labels.
       '';
     };
@@ -114,19 +114,19 @@ let
     timeout = mkOption {
       type = types.ints.unsigned;
       default = 600;
-      description = lib.mdDoc ''
+      description = ''
         HTTP timeout in seconds. 0 means forever or system timeout.
       '';
     };
   };
 
   syncOpts = {
-    enable = mkEnableOption (lib.mdDoc "lieer synchronization service");
+    enable = mkEnableOption "lieer synchronization service";
 
     frequency = mkOption {
       type = types.str;
       default = "*:0/5";
-      description = lib.mdDoc ''
+      description = ''
         How often to synchronize the account.
 
         This value is passed to the systemd timer configuration as the
@@ -138,13 +138,12 @@ let
   };
 
   lieerOpts = {
-    enable =
-      mkEnableOption (lib.mdDoc "lieer Gmail synchronization for notmuch");
+    enable = mkEnableOption "lieer Gmail synchronization for notmuch";
 
     notmuchSetupWarning = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Warn if Notmuch is not also enabled for this account.
 
         This can safely be disabled if {command}`notmuch init`
@@ -159,7 +158,7 @@ let
         options = settingsOpts;
       };
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Settings which are applied to {file}`.gmailieer.json`
         for the account.
 
@@ -232,14 +231,13 @@ in {
 
   options = {
     programs.lieer = {
-      enable =
-        mkEnableOption (lib.mdDoc "lieer Gmail synchronization for notmuch");
+      enable = mkEnableOption "lieer Gmail synchronization for notmuch";
 
       package = mkOption {
         type = types.package;
         default = pkgs.lieer;
         defaultText = "pkgs.lieer";
-        description = lib.mdDoc ''
+        description = ''
           lieer package to use.
         '';
       };
diff --git a/modules/programs/looking-glass-client.nix b/modules/programs/looking-glass-client.nix
index 55036a564..1c14282b9 100644
--- a/modules/programs/looking-glass-client.nix
+++ b/modules/programs/looking-glass-client.nix
@@ -9,14 +9,14 @@ in {
   meta.maintainers = with maintainers; [ j-brn ];
 
   options.programs.looking-glass-client = {
-    enable = mkEnableOption (lib.mdDoc "looking-glass-client");
+    enable = mkEnableOption "looking-glass-client";
 
-    package = mkPackageOptionMD pkgs "looking-glass-client" { };
+    package = mkPackageOption pkgs "looking-glass-client" { };
 
     settings = mkOption {
       type = settingsFormat.type;
       default = { };
-      description = lib.mdDoc "looking-glass-client settings.";
+      description = "looking-glass-client settings.";
       example = literalExpression ''
         {
           app = {
diff --git a/modules/programs/lsd.nix b/modules/programs/lsd.nix
index 02390e492..59a51a12a 100644
--- a/modules/programs/lsd.nix
+++ b/modules/programs/lsd.nix
@@ -21,12 +21,12 @@ in {
   meta.maintainers = [ ];
 
   options.programs.lsd = {
-    enable = mkEnableOption (lib.mdDoc "lsd");
+    enable = mkEnableOption "lsd";
 
     enableAliases = mkOption {
       default = false;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable recommended lsd aliases.
       '';
     };
@@ -38,7 +38,7 @@ in {
         date = "relative";
         ignore-globs = [ ".git" ".hg" ];
       };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/lsd/config.yaml`. See
         <https://github.com/Peltoche/lsd#config-file-content>
diff --git a/modules/programs/man.nix b/modules/programs/man.nix
index d7bdf30e4..49ea74853 100644
--- a/modules/programs/man.nix
+++ b/modules/programs/man.nix
@@ -9,7 +9,7 @@ in {
       enable = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable manual pages and the {command}`man`
           command. This also includes "man" outputs of all
           `home.packages`.
@@ -20,13 +20,13 @@ in {
         type = types.package;
         default = pkgs.man;
         defaultText = literalExpression "pkgs.man";
-        description = lib.mdDoc "The man package to use.";
+        description = "The man package to use.";
       };
 
       generateCaches = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to generate the manual page index caches using
           {manpage}`mandb(8)`. This allows searching for a page or
           keyword using utilities like {manpage}`apropos(1)`.
diff --git a/modules/programs/mangohud.nix b/modules/programs/mangohud.nix
index beb80c4d2..f0e35a3a3 100644
--- a/modules/programs/mangohud.nix
+++ b/modules/programs/mangohud.nix
@@ -26,19 +26,19 @@ let
 in {
   options = {
     programs.mangohud = {
-      enable = mkEnableOption (lib.mdDoc "Mangohud");
+      enable = mkEnableOption "Mangohud";
 
       package = mkOption {
         type = types.package;
         default = pkgs.mangohud;
         defaultText = literalExpression "pkgs.mangohud";
-        description = lib.mdDoc "The Mangohud package to install.";
+        description = "The Mangohud package to install.";
       };
 
       enableSessionWide = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Sets environment variables so that
           MangoHud is started on any application that supports it.
         '';
@@ -53,7 +53,7 @@ in {
             full = true;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/MangoHud/MangoHud.conf`. See
           <https://github.com/flightlessmango/MangoHud/blob/master/data/MangoHud.conf>
@@ -71,7 +71,7 @@ in {
             }
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Sets MangoHud settings per application.
           Configuration written to
           {file}`$XDG_CONFIG_HOME/MangoHud/{application_name}.conf`. See
diff --git a/modules/programs/matplotlib.nix b/modules/programs/matplotlib.nix
index 993703282..cde6f39fa 100644
--- a/modules/programs/matplotlib.nix
+++ b/modules/programs/matplotlib.nix
@@ -19,13 +19,12 @@ in {
   meta.maintainers = [ maintainers.rprospero ];
 
   options.programs.matplotlib = {
-    enable =
-      mkEnableOption (lib.mdDoc "matplotlib, a plotting library for python");
+    enable = mkEnableOption "matplotlib, a plotting library for python";
 
     config = mkOption {
       default = { };
       type = types.attrsOf types.anything;
-      description = lib.mdDoc ''
+      description = ''
         Add terms to the {file}`matplotlibrc` file to
         control the default matplotlib behavior.
       '';
@@ -45,7 +44,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Additional commands for matplotlib that will be added to the
         {file}`matplotlibrc` file.
       '';
diff --git a/modules/programs/mbsync-accounts.nix b/modules/programs/mbsync-accounts.nix
index 62b745153..abe5a8ca8 100644
--- a/modules/programs/mbsync-accounts.nix
+++ b/modules/programs/mbsync-accounts.nix
@@ -14,7 +14,7 @@ let
         # Make value of name the same as the name used with the dot prefix
         default = name;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           The name of this group for this account. These names are different than
           some others, because they will hide channel names that are the same.
         '';
@@ -23,7 +23,7 @@ let
       channels = mkOption {
         type = types.attrsOf (types.submodule channel);
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           List of channels that should be grouped together into this group. When
           performing a synchronization, the groups are synchronized, rather than
           the individual channels.
@@ -42,7 +42,7 @@ let
         type = types.str;
         default = name;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           The unique name for THIS channel in THIS group. The group will refer to
           this channel by this name.
 
@@ -55,7 +55,7 @@ let
         type = types.str;
         default = "";
         example = "[Gmail]/Sent Mail";
-        description = lib.mdDoc ''
+        description = ''
           IMAP4 patterns for which mailboxes on the remote mail server to sync.
           If `Patterns` are specified, `farPattern`
           is interpreted as a prefix which is not matched against the patterns,
@@ -70,7 +70,7 @@ let
         type = types.str;
         default = "";
         example = "Sent";
-        description = lib.mdDoc ''
+        description = ''
           Name for where mail coming from the remote (far) mail server will end up
           locally. The mailbox specified by the far pattern will be placed in
           this directory.
@@ -84,7 +84,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = [ "INBOX" ];
-        description = lib.mdDoc ''
+        description = ''
           Instead of synchronizing *just* the mailboxes that
           match the `farPattern`, use it as a prefix which is
           not matched against the patterns, and is not affected by mailbox list
@@ -103,7 +103,7 @@ let
             MaxSize = "1m";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration lines to add to *THIS* channel's
           configuration.
         '';
@@ -113,13 +113,13 @@ let
 
 in {
   options.mbsync = {
-    enable = mkEnableOption (lib.mdDoc "synchronization using mbsync");
+    enable = mkEnableOption "synchronization using mbsync";
 
     flatten = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = ".";
-      description = lib.mdDoc ''
+      description = ''
         If set, flattens the hierarchy within the maildir by
         substituting the canonical hierarchy delimiter
         `/` with this value.
@@ -130,7 +130,7 @@ in {
       type = types.enum [ "Verbatim" "Maildir++" "Legacy" ];
       default = "Verbatim";
       example = "Maildir++";
-      description = lib.mdDoc ''
+      description = ''
         The on-disk folder naming style. This option has no
         effect when {option}`flatten` is used.
       '';
@@ -140,7 +140,7 @@ in {
       type = types.enum [ "none" "maildir" "imap" "both" ];
       default = "none";
       example = "maildir";
-      description = lib.mdDoc ''
+      description = ''
         Automatically create missing mailboxes within the
         given mail store.
       '';
@@ -150,7 +150,7 @@ in {
       type = types.enum [ "none" "maildir" "imap" "both" ];
       default = "none";
       example = "imap";
-      description = lib.mdDoc ''
+      description = ''
         Propagate mailbox deletions to the given mail store.
       '';
     };
@@ -159,7 +159,7 @@ in {
       type = types.enum [ "none" "maildir" "imap" "both" ];
       default = "none";
       example = "both";
-      description = lib.mdDoc ''
+      description = ''
         Permanently remove messages marked for deletion from
         the given mail store.
       '';
@@ -168,7 +168,7 @@ in {
     patterns = mkOption {
       type = types.listOf types.str;
       default = [ "*" ];
-      description = lib.mdDoc ''
+      description = ''
         Pattern of mailboxes to synchronize.
       '';
     };
@@ -179,7 +179,7 @@ in {
       # The default cannot actually be empty, but contains an attribute set where
       # the channels set is empty. If a group is specified, then a name is given,
       # creating the attribute set.
-      description = lib.mdDoc ''
+      description = ''
         Some email providers (Gmail) have a different directory hierarchy for
         synchronized email messages. Namely, when using mbsync without specifying
         a set of channels into a group, all synchronized directories end up beneath
@@ -199,7 +199,7 @@ in {
           MaxSize = "1m";
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Per channel extra configuration.
       '';
     };
@@ -207,7 +207,7 @@ in {
     extraConfig.local = mkOption {
       type = extraConfigType;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Local store extra configuration.
       '';
     };
@@ -215,7 +215,7 @@ in {
     extraConfig.remote = mkOption {
       type = extraConfigType;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Remote store extra configuration.
       '';
     };
@@ -229,7 +229,7 @@ in {
           Timeout = 60;
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Account section extra configuration.
       '';
     };
diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync.nix
index 4347c7871..d43f64555 100644
--- a/modules/programs/mbsync.nix
+++ b/modules/programs/mbsync.nix
@@ -192,15 +192,14 @@ in {
 
   options = {
     programs.mbsync = {
-      enable = mkEnableOption
-        (lib.mdDoc "mbsync IMAP4 and Maildir mailbox synchronizer");
+      enable = mkEnableOption "mbsync IMAP4 and Maildir mailbox synchronizer";
 
       package = mkOption {
         type = types.package;
         default = pkgs.isync;
         defaultText = literalExpression "pkgs.isync";
         example = literalExpression "pkgs.isync";
-        description = lib.mdDoc "The package to use for the mbsync binary.";
+        description = "The package to use for the mbsync binary.";
       };
 
       groups = mkOption {
@@ -214,7 +213,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Definition of groups.
         '';
       };
@@ -222,7 +221,7 @@ in {
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration lines to add to the mbsync configuration.
         '';
       };
diff --git a/modules/programs/mcfly.nix b/modules/programs/mcfly.nix
index ed44ccbc9..75f6f2b31 100644
--- a/modules/programs/mcfly.nix
+++ b/modules/programs/mcfly.nix
@@ -20,12 +20,12 @@ in {
   ];
 
   options.programs.mcfly = {
-    enable = mkEnableOption (lib.mdDoc "mcfly");
+    enable = mkEnableOption "mcfly";
 
     keyScheme = mkOption {
       type = types.enum [ "emacs" "vim" ];
       default = "emacs";
-      description = lib.mdDoc ''
+      description = ''
         Key scheme to use.
       '';
     };
@@ -33,7 +33,7 @@ in {
     enableLightTheme = mkOption {
       default = false;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable light mode theme.
       '';
     };
@@ -41,7 +41,7 @@ in {
     fuzzySearchFactor = mkOption {
       default = 0;
       type = types.ints.unsigned;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable fuzzy searching.
         0 is off; higher numbers weight toward shorter matches.
         Values in the 2-5 range get good results so far.
@@ -51,7 +51,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -59,7 +59,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -67,7 +67,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/mercurial.nix b/modules/programs/mercurial.nix
index 95f5b3b79..07a7d626c 100644
--- a/modules/programs/mercurial.nix
+++ b/modules/programs/mercurial.nix
@@ -12,35 +12,35 @@ in {
 
   options = {
     programs.mercurial = {
-      enable = mkEnableOption (lib.mdDoc "Mercurial");
+      enable = mkEnableOption "Mercurial";
 
       package = mkOption {
         type = types.package;
         default = pkgs.mercurial;
         defaultText = literalExpression "pkgs.mercurial";
-        description = lib.mdDoc "Mercurial package to install.";
+        description = "Mercurial package to install.";
       };
 
       userName = mkOption {
         type = types.str;
-        description = lib.mdDoc "Default user name to use.";
+        description = "Default user name to use.";
       };
 
       userEmail = mkOption {
         type = types.str;
-        description = lib.mdDoc "Default user email to use.";
+        description = "Default user email to use.";
       };
 
       aliases = mkOption {
         type = types.attrsOf types.anything;
         default = { };
-        description = lib.mdDoc "Mercurial aliases to define.";
+        description = "Mercurial aliases to define.";
       };
 
       extraConfig = mkOption {
         type = types.either (types.attrsOf types.anything) types.lines;
         default = { };
-        description = lib.mdDoc "Additional configuration to add.";
+        description = "Additional configuration to add.";
       };
 
       iniContent = mkOption {
@@ -52,15 +52,14 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "*~" "*.swp" ];
-        description =
-          lib.mdDoc "List of globs for files to be globally ignored.";
+        description = "List of globs for files to be globally ignored.";
       };
 
       ignoresRegexp = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "^.*~$" "^.*\\.swp$" ];
-        description = lib.mdDoc
+        description =
           "List of regular expressions for files to be globally ignored.";
       };
     };
diff --git a/modules/programs/micro.nix b/modules/programs/micro.nix
index f748b4132..0093e25f0 100644
--- a/modules/programs/micro.nix
+++ b/modules/programs/micro.nix
@@ -13,7 +13,7 @@ in {
 
   options = {
     programs.micro = {
-      enable = mkEnableOption (lib.mdDoc "micro, a terminal-based text editor");
+      enable = mkEnableOption "micro, a terminal-based text editor";
 
       settings = mkOption {
         type = jsonFormat.type;
@@ -24,7 +24,7 @@ in {
             cursorline = false;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/micro/settings.json`. See
           <https://github.com/zyedidia/micro/blob/master/runtime/help/options.md>
diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix
index 3d0c58e11..eb9c9c4a7 100644
--- a/modules/programs/mpv.nix
+++ b/modules/programs/mpv.nix
@@ -61,14 +61,14 @@ let
 in {
   options = {
     programs.mpv = {
-      enable = mkEnableOption (lib.mdDoc "mpv");
+      enable = mkEnableOption "mpv";
 
       package = mkOption {
         type = types.package;
         default = pkgs.mpv;
         example = literalExpression
           "pkgs.wrapMpv (pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }) { youtubeSupport = true; }";
-        description = lib.mdDoc ''
+        description = ''
           Package providing mpv.
         '';
       };
@@ -77,7 +77,7 @@ in {
         type = types.package;
         readOnly = true;
         visible = false;
-        description = lib.mdDoc ''
+        description = ''
           Resulting mpv package.
         '';
       };
@@ -86,13 +86,13 @@ in {
         type = with types; listOf package;
         default = [ ];
         example = literalExpression "[ pkgs.mpvScripts.mpris ]";
-        description = lib.mdDoc ''
+        description = ''
           List of scripts to use with mpv.
         '';
       };
 
       scriptOpts = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Script options added to
           {file}`$XDG_CONFIG_HOME/mpv/script-opts/`. See
           {manpage}`mpv(1)`
@@ -110,7 +110,7 @@ in {
       };
 
       config = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/mpv/mpv.conf`. See
           {manpage}`mpv(1)`
@@ -129,7 +129,7 @@ in {
       };
 
       profiles = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Sub-configuration options for specific profiles written to
           {file}`$XDG_CONFIG_HOME/mpv/mpv.conf`. See
           {option}`programs.mpv.config` for more information.
@@ -150,7 +150,7 @@ in {
       };
 
       defaultProfiles = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Profiles to be applied by default. Options set by them are overridden
           by options set in [](#opt-programs.mpv.config).
         '';
@@ -160,7 +160,7 @@ in {
       };
 
       bindings = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Input configuration written to
           {file}`$XDG_CONFIG_HOME/mpv/input.conf`. See
           {manpage}`mpv(1)`
diff --git a/modules/programs/mr.nix b/modules/programs/mr.nix
index 3975dc723..507189769 100644
--- a/modules/programs/mr.nix
+++ b/modules/programs/mr.nix
@@ -15,14 +15,14 @@ in {
 
   options.programs.mr = {
     enable = mkEnableOption
-      (lib.mdDoc "mr, a tool to manage all your version control repositories");
+      "mr, a tool to manage all your version control repositories";
 
-    package = mkPackageOptionMD pkgs "mr" { };
+    package = mkPackageOption pkgs "mr" { };
 
     settings = mkOption {
       type = iniFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to {file}`$HOME/.mrconfig`
         See <https://myrepos.branchable.com/>
         for an example configuration.
diff --git a/modules/programs/msmtp-accounts.nix b/modules/programs/msmtp-accounts.nix
index 8d45c8735..5e1158bf5 100644
--- a/modules/programs/msmtp-accounts.nix
+++ b/modules/programs/msmtp-accounts.nix
@@ -7,7 +7,7 @@ with lib;
     enable = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable msmtp.
 
         If enabled then it is possible to use the
@@ -27,7 +27,7 @@ with lib;
         types.nullOr (types.strMatching "([[:alnum:]]{2}:)+[[:alnum:]]{2}");
       default = null;
       example = "my:SH:a2:56:ha:sh";
-      description = lib.mdDoc ''
+      description = ''
         Fingerprint of a trusted TLS certificate.
         The fingerprint can be obtained by executing
         {command}`msmtp --serverinfo --tls --tls-certcheck=off`.
@@ -38,7 +38,7 @@ with lib;
       type = types.attrsOf types.str;
       default = { };
       example = { auth = "login"; };
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration options to add to {file}`~/.msmtprc`.
         See <https://marlam.de/msmtp/msmtprc.txt> for
         examples.
diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp.nix
index 81c867472..2a4d6b788 100644
--- a/modules/programs/msmtp.nix
+++ b/modules/programs/msmtp.nix
@@ -49,12 +49,12 @@ in {
 
   options = {
     programs.msmtp = {
-      enable = mkEnableOption (lib.mdDoc "msmtp");
+      enable = mkEnableOption "msmtp";
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration lines to add to {file}`~/.msmtprc`.
           See <https://marlam.de/msmtp/msmtprc.txt> for examples.
 
@@ -68,7 +68,7 @@ in {
       extraAccounts = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration lines to add to the end of {file}`~/.msmtprc`.
           See <https://marlam.de/msmtp/msmtprc.txt> for examples.
         '';
diff --git a/modules/programs/mu.nix b/modules/programs/mu.nix
index 960a528fb..835be361a 100644
--- a/modules/programs/mu.nix
+++ b/modules/programs/mu.nix
@@ -27,7 +27,7 @@ in {
 
   options = {
     programs.mu = {
-      enable = mkEnableOption (lib.mdDoc "mu, a maildir indexer and searcher");
+      enable = mkEnableOption "mu, a maildir indexer and searcher";
 
       # No options/config file present for mu, and program author will not be
       # adding one soon. See https://github.com/djcb/mu/issues/882 for more
@@ -36,9 +36,8 @@ in {
 
     accounts.email.accounts = mkOption {
       type = with types;
-        attrsOf (submodule {
-          options.mu.enable = mkEnableOption (lib.mdDoc "mu indexing");
-        });
+        attrsOf
+        (submodule { options.mu.enable = mkEnableOption "mu indexing"; });
     };
   };
 
diff --git a/modules/programs/mujmap.nix b/modules/programs/mujmap.nix
index 75551df23..a0e74ab04 100644
--- a/modules/programs/mujmap.nix
+++ b/modules/programs/mujmap.nix
@@ -50,7 +50,7 @@ let
     lowercase = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         If true, translate all mailboxes to lowercase names when mapping to notmuch
         tags.
       '';
@@ -60,7 +60,7 @@ let
       type = types.str;
       default = "/";
       example = ".";
-      description = lib.mdDoc ''
+      description = ''
         Directory separator for mapping notmuch tags to maildirs.
       '';
     };
@@ -68,7 +68,7 @@ let
     inbox = mkOption {
       type = types.str;
       default = "inbox";
-      description = lib.mdDoc ''
+      description = ''
         Tag for notmuch to use for messages stored in the mailbox labeled with the
         `Inbox` name attribute.
 
@@ -80,7 +80,7 @@ let
     deleted = mkOption {
       type = types.str;
       default = "deleted";
-      description = lib.mdDoc ''
+      description = ''
         Tag for notmuch to use for messages stored in the mailbox labeled with the
         `Trash` name attribute.
 
@@ -92,7 +92,7 @@ let
     sent = mkOption {
       type = types.str;
       default = "sent";
-      description = lib.mdDoc ''
+      description = ''
         Tag for notmuch to use for messages stored in the mailbox labeled with the
         `Sent` name attribute.
 
@@ -104,7 +104,7 @@ let
     spam = mkOption {
       type = types.str;
       default = "spam";
-      description = lib.mdDoc ''
+      description = ''
         Tag for notmuch to use for messages stored in the mailbox labeled with the
         `Junk` name attribute and/or with the `$Junk` keyword,
         *except* for messages with the `$NotJunk` keyword.
@@ -117,7 +117,7 @@ let
     important = mkOption {
       type = types.str;
       default = "important";
-      description = lib.mdDoc ''
+      description = ''
         Tag for notmuch to use for messages stored in the mailbox labeled with the
         `Important` name attribute and/or with the `$Important`
         keyword.
@@ -130,7 +130,7 @@ let
     phishing = mkOption {
       type = types.str;
       default = "phishing";
-      description = lib.mdDoc ''
+      description = ''
         Tag for notmuch to use for the IANA `$Phishing` keyword.
 
         If set to an empty string, this keyword is not synchronized with a tag.
@@ -143,7 +143,7 @@ let
       type = types.nullOr types.str;
       default = null;
       example = "alice@example.com";
-      description = lib.mdDoc ''
+      description = ''
         Username for basic HTTP authentication.
 
         If `null`, defaults to
@@ -156,7 +156,7 @@ let
       default = null;
       apply = p: if isList p then escapeShellArgs p else p;
       example = "pass alice@example.com";
-      description = lib.mdDoc ''
+      description = ''
         Shell command which will print a password to stdout for basic HTTP
         authentication.
 
@@ -169,7 +169,7 @@ let
       type = types.nullOr types.str;
       default = null;
       example = "example.com";
-      description = lib.mdDoc ''
+      description = ''
         Fully qualified domain name of the JMAP service.
 
         mujmap looks up the JMAP SRV record for this host to determine the JMAP session
@@ -185,7 +185,7 @@ let
       type = types.nullOr types.str;
       default = null;
       example = "https://jmap.example.com/.well-known/jmap";
-      description = lib.mdDoc ''
+      description = ''
         Session URL to connect to.
 
         Mutually exclusive with
@@ -199,7 +199,7 @@ let
     auto_create_new_mailboxes = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to create new mailboxes automatically on the server from notmuch
         tags.
       '';
@@ -208,7 +208,7 @@ let
     cache_dir = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         The cache directory in which to store mail files while they are being
         downloaded. The default is operating-system specific.
       '';
@@ -220,7 +220,7 @@ let
         options = tagsOpts;
       };
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Tag configuration.
 
         Beware that there are quirks that require manual consideration if changing the
@@ -232,13 +232,12 @@ let
   };
 
   mujmapOpts = {
-    enable =
-      mkEnableOption (lib.mdDoc "mujmap JMAP synchronization for notmuch");
+    enable = mkEnableOption "mujmap JMAP synchronization for notmuch";
 
     notmuchSetupWarning = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Warn if Notmuch is not also enabled for this account.
 
         This can safely be disabled if {file}`mujmap.toml` is managed
@@ -252,7 +251,7 @@ let
         options = rootOpts;
       };
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Settings which are applied to {file}`mujmap.toml`
         for the account.
 
@@ -268,14 +267,13 @@ in {
 
   options = {
     programs.mujmap = {
-      enable =
-        mkEnableOption (lib.mdDoc "mujmap Gmail synchronization for notmuch");
+      enable = mkEnableOption "mujmap Gmail synchronization for notmuch";
 
       package = mkOption {
         type = types.package;
         default = pkgs.mujmap;
         defaultText = "pkgs.mujmap";
-        description = lib.mdDoc ''
+        description = ''
           mujmap package to use.
         '';
       };
diff --git a/modules/programs/navi.nix b/modules/programs/navi.nix
index adcd4ccee..aff50b5c7 100644
--- a/modules/programs/navi.nix
+++ b/modules/programs/navi.nix
@@ -16,13 +16,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.navi = {
-    enable = mkEnableOption (lib.mdDoc "Navi");
+    enable = mkEnableOption "Navi";
 
     package = mkOption {
       type = types.package;
       default = pkgs.navi;
       defaultText = literalExpression "pkgs.navi";
-      description = lib.mdDoc "The package to use for the navi binary.";
+      description = "The package to use for the navi binary.";
     };
 
     settings = mkOption {
@@ -37,7 +37,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/navi/config.yaml` on Linux or
         {file}`$HOME/Library/Application Support/navi/config.yaml`
@@ -47,15 +47,15 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+    enableBashIntegration = mkEnableOption "Bash integration" // {
       default = true;
     };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
       default = true;
     };
 
-    enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // {
+    enableFishIntegration = mkEnableOption "Fish integration" // {
       default = true;
     };
   };
diff --git a/modules/programs/ncmpcpp.nix b/modules/programs/ncmpcpp.nix
index 8e4018b29..d0f2c4748 100644
--- a/modules/programs/ncmpcpp.nix
+++ b/modules/programs/ncmpcpp.nix
@@ -31,14 +31,13 @@ let
     options = {
       key = mkOption {
         type = types.str;
-        description = lib.mdDoc "Key to bind.";
+        description = "Key to bind.";
         example = "j";
       };
 
       command = mkOption {
         type = with types; either str (listOf str);
-        description =
-          lib.mdDoc "Command or sequence of commands to be executed.";
+        description = "Command or sequence of commands to be executed.";
         example = "scroll_down";
       };
     };
@@ -48,14 +47,14 @@ in {
   meta.maintainers = [ hm.maintainers.olmokramer ];
 
   options.programs.ncmpcpp = {
-    enable = mkEnableOption
-      (lib.mdDoc "ncmpcpp - an ncurses Music Player Daemon (MPD) client");
+    enable =
+      mkEnableOption "ncmpcpp - an ncurses Music Player Daemon (MPD) client";
 
     package = mkOption {
       type = types.package;
       default = pkgs.ncmpcpp;
       defaultText = literalExpression "pkgs.ncmpcpp";
-      description = lib.mdDoc ''
+      description = ''
         Package providing the `ncmpcpp` command.
       '';
       example =
@@ -75,7 +74,7 @@ in {
         else
           null
       '';
-      description = lib.mdDoc ''
+      description = ''
         Value of the `mpd_music_dir` setting. On Linux platforms the
         value of {var}`services.mpd.musicDirectory` is used as the
         default if {var}`services.mpd.enable` is
@@ -87,7 +86,7 @@ in {
     settings = mkOption {
       type = types.attrsOf valueType;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Attribute set from name of a setting to its value. For available options
         see
         {manpage}`ncmpcpp(1)`.
@@ -98,7 +97,7 @@ in {
     bindings = mkOption {
       type = types.listOf bindingType;
       default = [ ];
-      description = lib.mdDoc "List of keybindings.";
+      description = "List of keybindings.";
       example = literalExpression ''
         [
           { key = "j"; command = "scroll_down"; }
diff --git a/modules/programs/ncspot.nix b/modules/programs/ncspot.nix
index 841262b1f..c3fe37a2c 100644
--- a/modules/programs/ncspot.nix
+++ b/modules/programs/ncspot.nix
@@ -12,13 +12,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.ncspot = {
-    enable = mkEnableOption (lib.mdDoc "ncspot");
+    enable = mkEnableOption "ncspot";
 
     package = mkOption {
       type = types.package;
       default = pkgs.ncspot;
       defaultText = literalExpression "pkgs.ncspot";
-      description = lib.mdDoc "The package to use for ncspot.";
+      description = "The package to use for ncspot.";
     };
 
     settings = mkOption {
@@ -30,7 +30,7 @@ in {
           gapless = true;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/ncspot/config.toml`.
 
diff --git a/modules/programs/ne.nix b/modules/programs/ne.nix
index 833070d45..3b0303124 100644
--- a/modules/programs/ne.nix
+++ b/modules/programs/ne.nix
@@ -22,7 +22,7 @@ in {
   meta.maintainers = [ hm.maintainers.cwyc ];
 
   options.programs.ne = {
-    enable = mkEnableOption (lib.mdDoc "ne");
+    enable = mkEnableOption "ne";
 
     keybindings = mkOption {
       type = types.lines;
@@ -31,7 +31,7 @@ in {
         KEY 7f BS
         SEQ "\x1b[1;5D" 7f
       '';
-      description = lib.mdDoc ''
+      description = ''
         Keybinding file for ne.
       '';
     };
@@ -39,7 +39,7 @@ in {
     defaultPreferences = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Default preferences for ne.
 
         Equivalent to `programs.ne.automaticPreferences.".default"`.
@@ -60,7 +60,7 @@ in {
           ''';
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Automatic preferences files for ne.
       '';
     };
@@ -68,7 +68,7 @@ in {
     menus = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc "Menu configuration file for ne.";
+      description = "Menu configuration file for ne.";
     };
 
     virtualExtensions = mkOption {
@@ -78,7 +78,7 @@ in {
         sh   1  ^#!\s*/.*\b(bash|sh|ksh|zsh)\s*
         csh  1  ^#!\s*/.*\b(csh|tcsh)\s*
       '';
-      description = lib.mdDoc "Virtual extensions configuration file for ne.";
+      description = "Virtual extensions configuration file for ne.";
     };
   };
 
diff --git a/modules/programs/neomutt-accounts.nix b/modules/programs/neomutt-accounts.nix
index ccf730f06..27e3b1229 100644
--- a/modules/programs/neomutt-accounts.nix
+++ b/modules/programs/neomutt-accounts.nix
@@ -8,23 +8,21 @@ let
       mailbox = mkOption {
         type = types.str;
         example = "Sent";
-        description = lib.mdDoc "Name of mailbox folder to be included";
+        description = "Name of mailbox folder to be included";
       };
 
       name = mkOption {
         type = types.nullOr types.str;
         example = "Junk";
         default = null;
-        description = lib.mdDoc "Name to display";
+        description = "Name to display";
       };
     };
   };
 
 in {
   options.notmuch.neomutt = {
-    enable = mkEnableOption (lib.mdDoc "Notmuch support in NeoMutt") // {
-      default = true;
-    };
+    enable = mkEnableOption "Notmuch support in NeoMutt" // { default = true; };
 
     virtualMailboxes = mkOption {
       type = types.listOf (types.submodule ./notmuch-virtual-mailbox.nix);
@@ -36,12 +34,12 @@ in {
         name = "My INBOX";
         query = "tag:inbox";
       }];
-      description = lib.mdDoc "List of virtual mailboxes using Notmuch queries";
+      description = "List of virtual mailboxes using Notmuch queries";
     };
   };
 
   options.neomutt = {
-    enable = mkEnableOption (lib.mdDoc "NeoMutt");
+    enable = mkEnableOption "NeoMutt";
 
     sendMailCommand = mkOption {
       type = types.nullOr types.str;
@@ -56,7 +54,7 @@ in {
           null
       '';
       example = "msmtpq --read-envelope-from --read-recipients";
-      description = lib.mdDoc ''
+      description = ''
         Command to send a mail. If not set, neomutt will be in charge of sending mails.
       '';
     };
@@ -65,7 +63,7 @@ in {
       type = types.lines;
       default = "";
       example = "color status cyan default";
-      description = lib.mdDoc ''
+      description = ''
         Extra lines to add to the folder hook for this account.
       '';
     };
@@ -74,13 +72,13 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "==== <mailbox-name> ===";
-      description = lib.mdDoc "Use a different name as mailbox name";
+      description = "Use a different name as mailbox name";
     };
 
     extraMailboxes = mkOption {
       type = with types; listOf (either str (submodule extraMailboxOptions));
       default = [ ];
-      description = lib.mdDoc "List of extra mailboxes";
+      description = "List of extra mailboxes";
     };
   };
 }
diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
index e749148c5..65f3144f4 100644
--- a/modules/programs/neomutt.nix
+++ b/modules/programs/neomutt.nix
@@ -10,18 +10,18 @@ let
 
   sidebarModule = types.submodule {
     options = {
-      enable = mkEnableOption (lib.mdDoc "sidebar support");
+      enable = mkEnableOption "sidebar support";
 
       width = mkOption {
         type = types.int;
         default = 22;
-        description = lib.mdDoc "Width of the sidebar";
+        description = "Width of the sidebar";
       };
 
       shortPath = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           By default sidebar shows the full path of the mailbox, but
           with this enabled only the relative name is shown.
         '';
@@ -30,7 +30,7 @@ let
       format = mkOption {
         type = types.str;
         default = "%D%?F? [%F]?%* %?N?%N/?%S";
-        description = lib.mdDoc ''
+        description = ''
           Sidebar format. Check neomutt documentation for details.
         '';
       };
@@ -71,19 +71,19 @@ let
           ];
         in with types; either (enum menus) (listOf (enum menus));
         default = "index";
-        description = lib.mdDoc "Select the menu to bind the command to.";
+        description = "Select the menu to bind the command to.";
       };
 
       key = mkOption {
         type = types.str;
         example = "<left>";
-        description = lib.mdDoc "The key to bind.";
+        description = "The key to bind.";
       };
 
       action = mkOption {
         type = types.str;
         example = "<enter-command>toggle sidebar_visible<enter><refresh>";
-        description = lib.mdDoc "Specify the action to take.";
+        description = "Specify the action to take.";
       };
     };
   };
@@ -251,31 +251,31 @@ let
 in {
   options = {
     programs.neomutt = {
-      enable = mkEnableOption (lib.mdDoc "the NeoMutt mail client");
+      enable = mkEnableOption "the NeoMutt mail client";
 
       package = mkOption {
         type = types.package;
         default = pkgs.neomutt;
         defaultText = literalExpression "pkgs.neomutt";
-        description = lib.mdDoc "The neomutt package to use.";
+        description = "The neomutt package to use.";
       };
 
       sidebar = mkOption {
         type = sidebarModule;
         default = { };
-        description = lib.mdDoc "Options related to the sidebar.";
+        description = "Options related to the sidebar.";
       };
 
       binds = mkOption {
         type = types.listOf bindModule;
         default = [ ];
-        description = lib.mdDoc "List of keybindings.";
+        description = "List of keybindings.";
       };
 
       macros = mkOption {
         type = types.listOf bindModule;
         default = [ ];
-        description = lib.mdDoc "List of macros.";
+        description = "List of macros.";
       };
 
       sort = mkOption {
@@ -283,44 +283,43 @@ in {
         type = types.enum
           (sortOptions ++ (map (option: "reverse-" + option) sortOptions));
         default = "threads";
-        description = lib.mdDoc "Sorting method on messages.";
+        description = "Sorting method on messages.";
       };
 
       vimKeys = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Enable vim-like bindings.";
+        description = "Enable vim-like bindings.";
       };
 
       checkStatsInterval = mkOption {
         type = types.nullOr types.int;
         default = null;
         example = 60;
-        description =
-          lib.mdDoc "Enable and set the interval of automatic mail check.";
+        description = "Enable and set the interval of automatic mail check.";
       };
 
       editor = mkOption {
         type = types.str;
         default = "$EDITOR";
-        description = lib.mdDoc "Select the editor used for writing mail.";
+        description = "Select the editor used for writing mail.";
       };
 
       settings = mkOption {
         type = types.attrsOf types.str;
         default = { };
-        description = lib.mdDoc "Extra configuration appended to the end.";
+        description = "Extra configuration appended to the end.";
       };
 
-      changeFolderWhenSourcingAccount = mkEnableOption
-        (lib.mdDoc "changing the folder when sourcing an account") // {
+      changeFolderWhenSourcingAccount =
+        mkEnableOption "changing the folder when sourcing an account" // {
           default = true;
         };
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc "Extra configuration appended to the end.";
+        description = "Extra configuration appended to the end.";
       };
     };
 
diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index d28ad9cb2..f5162f82d 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -17,7 +17,7 @@ let
     options = {
       config = mkOption {
         type = types.nullOr types.lines;
-        description = lib.mdDoc
+        description =
           "Script to configure this plugin. The scripting language should match type.";
         default = null;
       };
@@ -25,18 +25,18 @@ let
       type = mkOption {
         type =
           types.either (types.enum [ "lua" "viml" "teal" "fennel" ]) types.str;
-        description = lib.mdDoc
+        description =
           "Language used in config. Configurations are aggregated per-language.";
         default = "viml";
       };
 
-      optional = mkEnableOption (lib.mdDoc "optional") // {
+      optional = mkEnableOption "optional" // {
         description = "Don't load by default (load with :packadd)";
       };
 
       plugin = mkOption {
         type = types.package;
-        description = lib.mdDoc "vim plugin";
+        description = "vim plugin";
       };
 
       runtime = mkOption {
@@ -48,7 +48,7 @@ let
         example = literalExpression ''
           { "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Set of files that have to be linked in nvim config folder.
         '';
       };
@@ -97,12 +97,12 @@ in {
 
   options = {
     programs.neovim = {
-      enable = mkEnableOption (lib.mdDoc "Neovim");
+      enable = mkEnableOption "Neovim";
 
       viAlias = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Symlink {command}`vi` to {command}`nvim` binary.
         '';
       };
@@ -110,7 +110,7 @@ in {
       vimAlias = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Symlink {command}`vim` to {command}`nvim` binary.
         '';
       };
@@ -118,7 +118,7 @@ in {
       vimdiffAlias = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Alias {command}`vimdiff` to {command}`nvim -d`.
         '';
       };
@@ -126,7 +126,7 @@ in {
       withNodeJs = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Enable node provider. Set to `true` to
           use Node plugins.
         '';
@@ -135,7 +135,7 @@ in {
       withRuby = mkOption {
         type = types.nullOr types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Enable ruby provider.
         '';
       };
@@ -143,7 +143,7 @@ in {
       withPython3 = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Enable Python 3 provider. Set to `true` to
           use Python 3 plugins.
         '';
@@ -166,7 +166,7 @@ in {
         defaultText = literalExpression "ps: [ ]";
         example =
           literalExpression "pyPkgs: with pyPkgs; [ python-language-server ]";
-        description = lib.mdDoc ''
+        description = ''
           The extra Python 3 packages required for your plugins to work.
           This option accepts a function that takes a Python 3 package set as an argument,
           and selects the required Python 3 packages from this package set.
@@ -190,7 +190,7 @@ in {
         default = _: [ ];
         defaultText = literalExpression "ps: [ ]";
         example = literalExpression "luaPkgs: with luaPkgs; [ luautf8 ]";
-        description = lib.mdDoc ''
+        description = ''
           The extra Lua packages required for your plugins to work.
           This option accepts a function that takes a Lua package set as an argument,
           and selects the required Lua packages from this package set.
@@ -202,7 +202,7 @@ in {
         type = types.lines;
         visible = true;
         readOnly = true;
-        description = lib.mdDoc ''
+        description = ''
           Generated vimscript config.
         '';
       };
@@ -223,7 +223,7 @@ in {
               vim.opt.background = "dark"
             ''';
           }'';
-        description = lib.mdDoc ''
+        description = ''
           Generated configurations with as key their language (set via type).
         '';
       };
@@ -232,20 +232,20 @@ in {
         type = types.package;
         default = pkgs.neovim-unwrapped;
         defaultText = literalExpression "pkgs.neovim-unwrapped";
-        description = lib.mdDoc "The package to use for the neovim binary.";
+        description = "The package to use for the neovim binary.";
       };
 
       finalPackage = mkOption {
         type = types.package;
         visible = false;
         readOnly = true;
-        description = lib.mdDoc "Resulting customized neovim package.";
+        description = "Resulting customized neovim package.";
       };
 
       defaultEditor = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to configure {command}`nvim` as the default
           editor using the {env}`EDITOR` environment variable.
         '';
@@ -257,7 +257,7 @@ in {
         example = ''
           set nobackup
         '';
-        description = lib.mdDoc ''
+        description = ''
           Custom vimrc lines.
         '';
       };
@@ -268,7 +268,7 @@ in {
         example = ''
           vim.opt.nobackup = true
         '';
-        description = lib.mdDoc ''
+        description = ''
           Custom lua lines.
         '';
       };
@@ -277,7 +277,7 @@ in {
         type = with types; listOf package;
         default = [ ];
         example = literalExpression "[ pkgs.shfmt ]";
-        description = lib.mdDoc "Extra packages available to nvim.";
+        description = "Extra packages available to nvim.";
       };
 
       plugins = mkOption {
@@ -292,7 +292,7 @@ in {
             }
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           List of vim plugins to install optionally associated with
           configuration to be placed in init.vim.
 
@@ -301,13 +301,13 @@ in {
       };
 
       coc = {
-        enable = mkEnableOption (lib.mdDoc "Coc");
+        enable = mkEnableOption "Coc";
 
         package = mkOption {
           type = types.package;
           default = pkgs.vimPlugins.coc-nvim;
           defaultText = literalExpression "pkgs.vimPlugins.coc-nvim";
-          description = lib.mdDoc "The package to use for the CoC plugin.";
+          description = "The package to use for the CoC plugin.";
         };
 
         settings = mkOption {
@@ -335,7 +335,7 @@ in {
               };
             };
           '';
-          description = lib.mdDoc ''
+          description = ''
             Extra configuration lines to add to
             {file}`$XDG_CONFIG_HOME/nvim/coc-settings.json`
             See
@@ -347,7 +347,7 @@ in {
         pluginConfig = mkOption {
           type = types.lines;
           default = "";
-          description = lib.mdDoc "Script to configure CoC. Must be viml.";
+          description = "Script to configure CoC. Must be viml.";
         };
       };
     };
diff --git a/modules/programs/newsboat.nix b/modules/programs/newsboat.nix
index d048bda7a..d2782bf2d 100644
--- a/modules/programs/newsboat.nix
+++ b/modules/programs/newsboat.nix
@@ -37,7 +37,7 @@ in {
 
   options = {
     programs.newsboat = {
-      enable = mkEnableOption (lib.mdDoc "the Newsboat feed reader");
+      enable = mkEnableOption "the Newsboat feed reader";
 
       urls = mkOption {
         type = types.listOf (types.submodule {
@@ -45,21 +45,21 @@ in {
             url = mkOption {
               type = types.str;
               example = "http://example.com";
-              description = lib.mdDoc "Feed URL.";
+              description = "Feed URL.";
             };
 
             tags = mkOption {
               type = types.listOf types.str;
               default = [ ];
               example = [ "foo" "bar" ];
-              description = lib.mdDoc "Feed tags.";
+              description = "Feed tags.";
             };
 
             title = mkOption {
               type = types.nullOr types.str;
               default = null;
               example = "ORF News";
-              description = lib.mdDoc "Feed title.";
+              description = "Feed title.";
             };
           };
         });
@@ -68,7 +68,7 @@ in {
           url = "http://example.com";
           tags = [ "foo" "bar" ];
         }];
-        description = lib.mdDoc ''
+        description = ''
           List of news feeds. Leave it empty if you want to manage feeds
           imperatively, for example, using Syncthing.
         '';
@@ -77,21 +77,19 @@ in {
       maxItems = mkOption {
         type = types.int;
         default = 0;
-        description =
-          lib.mdDoc "Maximum number of items per feed, 0 for infinite.";
+        description = "Maximum number of items per feed, 0 for infinite.";
       };
 
       reloadThreads = mkOption {
         type = types.int;
         default = 5;
-        description =
-          lib.mdDoc "How many threads to use for updating the feeds.";
+        description = "How many threads to use for updating the feeds.";
       };
 
       autoReload = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable automatic reloading while newsboat is running.
         '';
       };
@@ -99,26 +97,26 @@ in {
       reloadTime = mkOption {
         type = types.nullOr types.int;
         default = 60;
-        description = lib.mdDoc "Time in minutes between reloads.";
+        description = "Time in minutes between reloads.";
       };
 
       browser = mkOption {
         type = types.str;
         default = "${pkgs.xdg-utils}/bin/xdg-open";
-        description = lib.mdDoc "External browser to use.";
+        description = "External browser to use.";
       };
 
       queries = mkOption {
         type = types.attrsOf types.str;
         default = { };
         example = { "foo" = ''rssurl =~ "example.com"''; };
-        description = lib.mdDoc "A list of queries to use.";
+        description = "A list of queries to use.";
       };
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration values that will be appended to the end.
         '';
       };
diff --git a/modules/programs/nheko.nix b/modules/programs/nheko.nix
index b159828e8..1bf1ae706 100644
--- a/modules/programs/nheko.nix
+++ b/modules/programs/nheko.nix
@@ -22,9 +22,9 @@ in {
   meta.maintainers = [ maintainers.gvolpe ];
 
   options.programs.nheko = {
-    enable = mkEnableOption (lib.mdDoc "Qt desktop client for Matrix");
+    enable = mkEnableOption "Qt desktop client for Matrix";
 
-    package = mkPackageOptionMD pkgs "nheko" { };
+    package = mkPackageOption pkgs "nheko" { };
 
     settings = mkOption {
       type = iniFmt.type;
@@ -47,7 +47,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of Nheko preferences (converted to an INI file).
 
         For now, it is recommended to run nheko and sign-in before filling in
diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index.nix
index d8d604b27..49f4b52e3 100644
--- a/modules/programs/nix-index.nix
+++ b/modules/programs/nix-index.nix
@@ -4,26 +4,24 @@ in {
   meta.maintainers = with lib.hm.maintainers; [ ambroisie ];
 
   options.programs.nix-index = with lib; {
-    enable =
-      mkEnableOption (lib.mdDoc "nix-index, a file database for nixpkgs");
+    enable = mkEnableOption "nix-index, a file database for nixpkgs";
 
     package = mkOption {
       type = types.package;
       default = pkgs.nix-index;
       defaultText = literalExpression "pkgs.nix-index";
-      description =
-        lib.mdDoc "Package providing the {command}`nix-index` tool.";
+      description = "Package providing the {command}`nix-index` tool.";
     };
 
-    enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+    enableBashIntegration = mkEnableOption "Bash integration" // {
       default = true;
     };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
       default = true;
     };
 
-    enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // {
+    enableFishIntegration = mkEnableOption "Fish integration" // {
       default = true;
     };
   };
diff --git a/modules/programs/nnn.nix b/modules/programs/nnn.nix
index 716cef4fe..4a81486fb 100644
--- a/modules/programs/nnn.nix
+++ b/modules/programs/nnn.nix
@@ -23,14 +23,14 @@ let
           }) + "/plugins";
         '';
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Path to the plugin folder.
         '';
       };
 
       mappings = mkOption {
         type = with types; attrsOf str;
-        description = lib.mdDoc ''
+        description = ''
           Key mappings to the plugins.
         '';
         default = { };
@@ -49,7 +49,7 @@ in {
 
   options = {
     programs.nnn = {
-      enable = mkEnableOption (lib.mdDoc "nnn");
+      enable = mkEnableOption "nnn";
 
       package = mkOption {
         type = types.package;
@@ -57,7 +57,7 @@ in {
         defaultText = literalExpression "pkgs.nnn";
         example =
           literalExpression "pkgs.nnn.override ({ withNerdIcons = true; });";
-        description = lib.mdDoc ''
+        description = ''
           Package containing the {command}`nnn` program.
         '';
       };
@@ -66,14 +66,14 @@ in {
         type = types.package;
         readOnly = true;
         visible = false;
-        description = lib.mdDoc ''
+        description = ''
           Resulting nnn package.
         '';
       };
 
       bookmarks = mkOption {
         type = with types; attrsOf str;
-        description = lib.mdDoc ''
+        description = ''
           Directory bookmarks.
         '';
         example = literalExpression ''
@@ -91,7 +91,7 @@ in {
         type = with types; listOf package;
         example =
           literalExpression "with pkgs; [ ffmpegthumbnailer mediainfo sxiv ]";
-        description = lib.mdDoc ''
+        description = ''
           Extra packages available to nnn.
         '';
         default = [ ];
@@ -99,7 +99,7 @@ in {
 
       plugins = mkOption {
         type = pluginModule;
-        description = lib.mdDoc ''
+        description = ''
           Manage nnn plugins.
         '';
         default = { };
diff --git a/modules/programs/noti.nix b/modules/programs/noti.nix
index 1c354205c..491d73b0e 100644
--- a/modules/programs/noti.nix
+++ b/modules/programs/noti.nix
@@ -10,12 +10,12 @@ in {
   meta.maintainers = [ ];
 
   options.programs.noti = {
-    enable = mkEnableOption (lib.mdDoc "Noti");
+    enable = mkEnableOption "Noti";
 
     settings = mkOption {
       type = types.attrsOf (types.attrsOf types.str);
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/noti/noti.yaml`.
 
diff --git a/modules/programs/notmuch-virtual-mailbox.nix b/modules/programs/notmuch-virtual-mailbox.nix
index 3fc9163ed..72a788421 100644
--- a/modules/programs/notmuch-virtual-mailbox.nix
+++ b/modules/programs/notmuch-virtual-mailbox.nix
@@ -5,29 +5,28 @@ with lib; {
       type = types.str;
       example = "My INBOX";
       default = "My INBOX";
-      description = lib.mdDoc "Name to display";
+      description = "Name to display";
     };
 
     query = mkOption {
       type = types.str;
       example = "tag:inbox";
       default = "tag:inbox";
-      description = lib.mdDoc "Notmuch query";
+      description = "Notmuch query";
     };
 
     limit = mkOption {
       type = types.nullOr types.int;
       example = 10;
       default = null;
-      description =
-        lib.mdDoc "Restricts number of messages/threads in the result.";
+      description = "Restricts number of messages/threads in the result.";
     };
 
     type = mkOption {
       type = types.nullOr (types.enum ([ "threads" "messages" ]));
       example = "threads";
       default = null;
-      description = lib.mdDoc
+      description =
         "Reads all matching messages or whole-threads. The default is 'messages' or nm_query_type.";
     };
   };
diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix
index 886a4738c..a3d679b23 100644
--- a/modules/programs/notmuch.nix
+++ b/modules/programs/notmuch.nix
@@ -47,7 +47,7 @@ let
 in {
   options = {
     programs.notmuch = {
-      enable = mkEnableOption (lib.mdDoc "Notmuch mail indexer");
+      enable = mkEnableOption "Notmuch mail indexer";
 
       new = mkOption {
         type = types.submodule {
@@ -55,7 +55,7 @@ in {
             ignore = mkOption {
               type = types.listOf types.str;
               default = [ ];
-              description = lib.mdDoc ''
+              description = ''
                 A list to specify files and directories that will not be
                 searched for messages by {command}`notmuch new`.
               '';
@@ -65,7 +65,7 @@ in {
               type = types.listOf types.str;
               default = [ "unread" "inbox" ];
               example = [ "new" ];
-              description = lib.mdDoc ''
+              description = ''
                 A list of tags that will be added to all messages
                 incorporated by {command}`notmuch new`.
               '';
@@ -73,7 +73,7 @@ in {
           };
         };
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Options related to email processing performed by
           {command}`notmuch new`.
         '';
@@ -82,7 +82,7 @@ in {
       extraConfig = mkOption {
         type = types.attrsOf (types.attrsOf types.str);
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Options that should be appended to the notmuch configuration file.
         '';
       };
@@ -92,7 +92,7 @@ in {
           type = types.lines;
           default = "";
           example = "mbsync --all";
-          description = lib.mdDoc ''
+          description = ''
             Bash statements run before scanning or importing new
             messages into the database.
           '';
@@ -104,7 +104,7 @@ in {
           example = ''
             notmuch tag +nixos -- tag:new and from:nixos1@discoursemail.com
           '';
-          description = lib.mdDoc ''
+          description = ''
             Bash statements run after new messages have been imported
             into the database and initial tags have been applied.
           '';
@@ -113,7 +113,7 @@ in {
         postInsert = mkOption {
           type = types.lines;
           default = "";
-          description = lib.mdDoc ''
+          description = ''
             Bash statements run after a message has been inserted
             into the database and initial tags have been applied.
           '';
@@ -124,7 +124,7 @@ in {
         synchronizeFlags = mkOption {
           type = types.bool;
           default = true;
-          description = lib.mdDoc ''
+          description = ''
             Whether to synchronize Maildir flags.
           '';
         };
@@ -135,7 +135,7 @@ in {
           type = types.listOf types.str;
           default = [ "deleted" "spam" ];
           example = [ "trash" "spam" ];
-          description = lib.mdDoc ''
+          description = ''
             A  list  of  tags  that  will be excluded from search results by
             default. Using an excluded tag in a  query  will  override  that
             exclusion.
@@ -147,8 +147,7 @@ in {
     accounts.email.accounts = mkOption {
       type = with types;
         attrsOf (submodule {
-          options.notmuch.enable =
-            mkEnableOption (lib.mdDoc "notmuch indexing");
+          options.notmuch.enable = mkEnableOption "notmuch indexing";
         });
     };
   };
diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix
index 3ccd754a2..58b549a55 100644
--- a/modules/programs/nushell.nix
+++ b/modules/programs/nushell.nix
@@ -22,7 +22,7 @@ let
             "";
           defaultText = literalExpression
             "if source is defined, the content of source, otherwise empty";
-          description = lib.mdDoc ''
+          description = ''
             Text of the nushell {file}`${name}` file.
             If unset then the source option will be preferred.
           '';
@@ -31,7 +31,7 @@ let
         source = mkOption {
           type = types.nullOr types.path;
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             Path of the nushell {file}`${name}` file to use.
             If the text option is set, it will be preferred.
           '';
@@ -52,13 +52,13 @@ in {
   ];
 
   options.programs.nushell = {
-    enable = mkEnableOption (lib.mdDoc "nushell");
+    enable = mkEnableOption "nushell";
 
     package = mkOption {
       type = types.package;
       default = pkgs.nushell;
       defaultText = literalExpression "pkgs.nushell";
-      description = lib.mdDoc "The package to use for nushell.";
+      description = "The package to use for nushell.";
     };
 
     configFile = mkOption {
@@ -74,7 +74,7 @@ in {
           ''';
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         The configuration file to be used for nushell.
 
         See <https://www.nushell.sh/book/configuration.html#configuration> for more information.
@@ -87,7 +87,7 @@ in {
       example = ''
         let-env FOO = 'BAR'
       '';
-      description = lib.mdDoc ''
+      description = ''
         The environment variables file to be used for nushell.
 
         See <https://www.nushell.sh/book/configuration.html#configuration> for more information.
@@ -103,7 +103,7 @@ in {
           echo "Hello, World"
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         The login file to be used for nushell upon logging in.
 
         See <https://www.nushell.sh/book/configuration.html#configuring-nu-as-a-login-shell> for more information.
@@ -113,7 +113,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Additional configuration to add to the nushell configuration file.
       '';
     };
@@ -121,7 +121,7 @@ in {
     extraEnv = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Additional configuration to add to the nushell environment variables file.
       '';
     };
@@ -129,7 +129,7 @@ in {
     extraLogin = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Additional configuration to add to the nushell login file.
       '';
     };
@@ -138,7 +138,7 @@ in {
       type = types.attrsOf types.str;
       default = { };
       example = { ll = "ls -l"; };
-      description = lib.mdDoc ''
+      description = ''
         An attribute set that maps aliases (the top level attribute names in
         this option) to command strings or directly to build outputs.
       '';
@@ -148,7 +148,7 @@ in {
       type = types.attrsOf types.str;
       default = { };
       example = { FOO = "BAR"; };
-      description = lib.mdDoc ''
+      description = ''
         An attribute set that maps an environment variable to a shell interpreted string.
       '';
     };
diff --git a/modules/programs/obs-studio.nix b/modules/programs/obs-studio.nix
index b8cee836c..ba5c89191 100644
--- a/modules/programs/obs-studio.nix
+++ b/modules/programs/obs-studio.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     programs.obs-studio = {
-      enable = mkEnableOption (lib.mdDoc "obs-studio");
+      enable = mkEnableOption "obs-studio";
 
       package = mkOption {
         type = types.package;
         default = pkgs.obs-studio;
         defaultText = literalExpression "pkgs.obs-studio";
-        description = lib.mdDoc ''
+        description = ''
           OBS Studio package to install.
         '';
       };
@@ -26,13 +26,13 @@ in {
         type = types.package;
         visible = false;
         readOnly = true;
-        description = lib.mdDoc "Resulting customized OBS Studio package.";
+        description = "Resulting customized OBS Studio package.";
       };
 
       plugins = mkOption {
         default = [ ];
         example = literalExpression "[ pkgs.obs-studio-plugins.wlrobs ]";
-        description = lib.mdDoc "Optional OBS plugins.";
+        description = "Optional OBS plugins.";
         type = types.listOf types.package;
       };
     };
diff --git a/modules/programs/octant.nix b/modules/programs/octant.nix
index e61c9b99e..f3b810c90 100644
--- a/modules/programs/octant.nix
+++ b/modules/programs/octant.nix
@@ -23,20 +23,20 @@ in {
 
   options = {
     programs.octant = {
-      enable = mkEnableOption (lib.mdDoc "octant");
+      enable = mkEnableOption "octant";
 
       package = mkOption {
         type = types.package;
         default = pkgs.octant;
         defaultText = literalExpression "pkgs.octant";
         example = literalExpression "pkgs.octant-other";
-        description = lib.mdDoc "The Octant package to use.";
+        description = "The Octant package to use.";
       };
 
       plugins = mkOption {
         default = [ ];
         example = literalExpression "[ pkgs.starboard-octant-plugin ]";
-        description = lib.mdDoc "Optional Octant plugins.";
+        description = "Optional Octant plugins.";
         type = types.listOf types.package;
       };
     };
diff --git a/modules/programs/offlineimap-accounts.nix b/modules/programs/offlineimap-accounts.nix
index a4f3a85c8..afc7a0199 100644
--- a/modules/programs/offlineimap-accounts.nix
+++ b/modules/programs/offlineimap-accounts.nix
@@ -8,13 +8,13 @@ let
 
 in {
   options.offlineimap = {
-    enable = mkEnableOption (lib.mdDoc "OfflineIMAP");
+    enable = mkEnableOption "OfflineIMAP";
 
     extraConfig.account = mkOption {
       type = extraConfigType;
       default = { };
       example = { autorefresh = 20; };
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration options to add to the account section.
       '';
     };
@@ -23,7 +23,7 @@ in {
       type = extraConfigType;
       default = { };
       example = { sync_deletes = true; };
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration options to add to the local account
         section.
       '';
@@ -36,7 +36,7 @@ in {
         maxconnections = 2;
         expunge = false;
       };
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration options to add to the remote account
         section.
       '';
@@ -45,7 +45,7 @@ in {
     postSyncHookCommand = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc "Command to run after fetching new mails.";
+      description = "Command to run after fetching new mails.";
     };
   };
 }
diff --git a/modules/programs/offlineimap.nix b/modules/programs/offlineimap.nix
index 2927333d2..e3a47817f 100644
--- a/modules/programs/offlineimap.nix
+++ b/modules/programs/offlineimap.nix
@@ -88,9 +88,9 @@ let
 in {
   options = {
     programs.offlineimap = {
-      enable = mkEnableOption (lib.mdDoc "OfflineIMAP");
+      enable = mkEnableOption "OfflineIMAP";
 
-      package = mkPackageOptionMD pkgs "offlineimap" {
+      package = mkPackageOption pkgs "offlineimap" {
         example = ''
           pkgs.offlineimap.overridePythonAttrs ( old: {
             propagatedBuildInputs = old.propagatedBuildInputs
@@ -108,7 +108,7 @@ in {
           def get_pass(service, cmd):
               return subprocess.check_output(cmd, )
         '';
-        description = lib.mdDoc ''
+        description = ''
           Python code that can then be used in other parts of the
           configuration.
         '';
@@ -121,7 +121,7 @@ in {
           maxage = 30;
           ui = "blinkenlights";
         };
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration options added to the
           {option}`general` section.
         '';
@@ -131,7 +131,7 @@ in {
         type = extraConfigType;
         default = { };
         example = { gmailtrashfolder = "[Gmail]/Papierkorb"; };
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration options added to the
           {option}`DEFAULT` section.
         '';
@@ -149,7 +149,7 @@ in {
             footer = "'\\n'";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration options added to the
           `mbnames` section.
         '';
diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix
index 63d388782..1c6941caa 100644
--- a/modules/programs/oh-my-posh.nix
+++ b/modules/programs/oh-my-posh.nix
@@ -18,17 +18,16 @@ in {
   meta.maintainers = [ maintainers.arjan-s ];
 
   options.programs.oh-my-posh = {
-    enable = mkEnableOption
-      (lib.mdDoc "oh-my-posh, a prompt theme engine for any shell");
+    enable = mkEnableOption "oh-my-posh, a prompt theme engine for any shell";
 
-    package = mkPackageOptionMD pkgs "oh-my-posh" { };
+    package = mkPackageOption pkgs "oh-my-posh" { };
 
     settings = mkOption {
       type = jsonFormat.type;
       default = { };
       example = literalExpression ''
         builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "''${pkgs.oh-my-posh}/share/oh-my-posh/themes/space.omp.json"))'';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/oh-my-posh/config.json`. See
         <https://ohmyposh.dev/docs/configuration/overview>
@@ -40,7 +39,7 @@ in {
     useTheme = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Use one of the official themes. This should be a name from this list:
         <https://ohmyposh.dev/docs/themes>. Because a theme
         is essentially a configuration file, this option is not used when a
@@ -51,7 +50,7 @@ in {
     enableBashIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -59,7 +58,7 @@ in {
     enableZshIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -67,7 +66,7 @@ in {
     enableFishIntegration = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/opam.nix b/modules/programs/opam.nix
index 7f139f6e8..34338514a 100644
--- a/modules/programs/opam.nix
+++ b/modules/programs/opam.nix
@@ -10,19 +10,19 @@ in {
   meta.maintainers = [ ];
 
   options.programs.opam = {
-    enable = mkEnableOption (lib.mdDoc "Opam");
+    enable = mkEnableOption "Opam";
 
     package = mkOption {
       type = types.package;
       default = pkgs.opam;
       defaultText = literalExpression "pkgs.opam";
-      description = lib.mdDoc "Opam package to install.";
+      description = "Opam package to install.";
     };
 
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -30,7 +30,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -38,7 +38,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/pandoc.nix b/modules/programs/pandoc.nix
index 5a2858c1b..7f0fa713c 100644
--- a/modules/programs/pandoc.nix
+++ b/modules/programs/pandoc.nix
@@ -22,20 +22,20 @@ in {
   meta.maintainers = [ lib.maintainers.kirelagin ];
 
   options.programs.pandoc = {
-    enable = mkEnableOption (lib.mdDoc "pandoc");
+    enable = mkEnableOption "pandoc";
 
     package = mkOption {
       type = types.package;
       default = pkgs.pandoc;
       defaultText = literalExpression "pkgs.pandoc";
-      description = lib.mdDoc "The pandoc package to use.";
+      description = "The pandoc package to use.";
     };
 
     # We wrap the executable to pass some arguments
     finalPackage = mkOption {
       type = types.package;
       readOnly = true;
-      description = lib.mdDoc "Resulting package.";
+      description = "Resulting package.";
     };
 
     defaults = mkOption {
@@ -50,7 +50,7 @@ in {
           citeproc = true;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Options to set by default.
         These will be converted to JSON and written to a defaults
         file (see Default files in pandoc documentation).
@@ -60,7 +60,7 @@ in {
     defaultsFile = mkOption {
       type = types.path;
       readOnly = true;
-      description = lib.mdDoc "Resulting defaults file.";
+      description = "Resulting defaults file.";
     };
 
     templates = mkOption {
@@ -71,14 +71,14 @@ in {
           "default.latex" = path/to/your/template;
         }
       '';
-      description = lib.mdDoc "Custom templates.";
+      description = "Custom templates.";
     };
 
     citationStyles = mkOption {
       type = types.listOf types.path;
       default = [ ];
       example = literalExpression "[ path/to/file.csl ]";
-      description = lib.mdDoc "List of .csl files to install.";
+      description = "List of .csl files to install.";
     };
   };
 
diff --git a/modules/programs/papis.nix b/modules/programs/papis.nix
index 4611b66d3..b110172d9 100644
--- a/modules/programs/papis.nix
+++ b/modules/programs/papis.nix
@@ -17,7 +17,7 @@ in {
   meta.maintainers = [ ];
 
   options.programs.papis = {
-    enable = mkEnableOption (lib.mdDoc "papis");
+    enable = mkEnableOption "papis";
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool int str ]);
@@ -29,7 +29,7 @@ in {
           add-edit = true;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/papis/config`. See
         <https://papis.readthedocs.io/en/latest/configuration.html>
@@ -44,14 +44,14 @@ in {
             type = types.str;
             default = name;
             readOnly = true;
-            description = lib.mdDoc "This library's name.";
+            description = "This library's name.";
           };
 
           isDefault = mkOption {
             type = types.bool;
             default = false;
             example = true;
-            description = lib.mdDoc ''
+            description = ''
               Whether this is a default library. There must be exactly one
               default library.
             '';
@@ -65,13 +65,13 @@ in {
                 dir = "~/papers/";
               }
             '';
-            description = lib.mdDoc ''
+            description = ''
               Configuration for this library.
             '';
           };
         };
       }));
-      description = lib.mdDoc "Attribute set of papis libraries.";
+      description = "Attribute set of papis libraries.";
     };
   };
 
diff --git a/modules/programs/password-store.nix b/modules/programs/password-store.nix
index 806949fec..203eaa349 100644
--- a/modules/programs/password-store.nix
+++ b/modules/programs/password-store.nix
@@ -10,7 +10,7 @@ in {
   meta.maintainers = with maintainers; [ pacien ];
 
   options.programs.password-store = {
-    enable = mkEnableOption (lib.mdDoc "Password store");
+    enable = mkEnableOption "Password store";
 
     package = mkOption {
       type = types.package;
@@ -19,7 +19,7 @@ in {
       example = literalExpression ''
         pkgs.pass.withExtensions (exts: [ exts.pass-otp ])
       '';
-      description = lib.mdDoc ''
+      description = ''
         The `pass` package to use.
         Can be used to specify extensions.
       '';
@@ -41,7 +41,7 @@ in {
           PASSWORD_STORE_CLIP_TIME = "60";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         The `pass` environment variables dictionary.
 
         See the "Environment variables" section of
diff --git a/modules/programs/pazi.nix b/modules/programs/pazi.nix
index 46457b00a..9e603df23 100644
--- a/modules/programs/pazi.nix
+++ b/modules/programs/pazi.nix
@@ -10,12 +10,12 @@ in {
   meta.maintainers = [ ];
 
   options.programs.pazi = {
-    enable = mkEnableOption (lib.mdDoc "pazi");
+    enable = mkEnableOption "pazi";
 
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -23,7 +23,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -31,7 +31,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/pet.nix b/modules/programs/pet.nix
index 97fbbddab..ee7c107d6 100644
--- a/modules/programs/pet.nix
+++ b/modules/programs/pet.nix
@@ -14,7 +14,7 @@ let
         type = types.str;
         default = "";
         example = "Count the number of commits in the current branch";
-        description = lib.mdDoc ''
+        description = ''
           Description of the snippet.
         '';
       };
@@ -23,7 +23,7 @@ let
         type = types.str;
         default = "";
         example = "git rev-list --count HEAD";
-        description = lib.mdDoc ''
+        description = ''
           The command.
         '';
       };
@@ -32,7 +32,7 @@ let
         type = types.str;
         default = "";
         example = "473";
-        description = lib.mdDoc ''
+        description = ''
           Example output of the command.
         '';
       };
@@ -41,7 +41,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = literalExpression ''["git" "nixpkgs"]'';
-        description = lib.mdDoc ''
+        description = ''
           List of tags attached to the command.
         '';
       };
@@ -50,12 +50,12 @@ let
 
 in {
   options.programs.pet = {
-    enable = mkEnableOption (lib.mdDoc "pet");
+    enable = mkEnableOption "pet";
 
     settings = mkOption {
       type = format.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Settings written to {file}`config.toml`. See the pet
         documentation for details.
       '';
@@ -65,7 +65,7 @@ in {
       type = types.package;
       default = pkgs.fzf;
       defaultText = literalExpression "pkgs.fzf";
-      description = lib.mdDoc ''
+      description = ''
         The package needed for the {var}`settings.selectcmd`.
       '';
     };
@@ -73,7 +73,7 @@ in {
     snippets = mkOption {
       type = types.listOf snippetType;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         The snippets.
       '';
     };
diff --git a/modules/programs/pidgin.nix b/modules/programs/pidgin.nix
index 93f86c3fc..d7536be71 100644
--- a/modules/programs/pidgin.nix
+++ b/modules/programs/pidgin.nix
@@ -11,19 +11,19 @@ in {
 
   options = {
     programs.pidgin = {
-      enable = mkEnableOption (lib.mdDoc "Pidgin messaging client");
+      enable = mkEnableOption "Pidgin messaging client";
 
       package = mkOption {
         type = types.package;
         default = pkgs.pidgin;
         defaultText = literalExpression "pkgs.pidgin";
-        description = lib.mdDoc "The Pidgin package to use.";
+        description = "The Pidgin package to use.";
       };
 
       plugins = mkOption {
         default = [ ];
         example = literalExpression "[ pkgs.pidgin-otr pkgs.pidgin-osd ]";
-        description = lib.mdDoc "Plugins that should be available to Pidgin.";
+        description = "Plugins that should be available to Pidgin.";
       };
     };
   };
diff --git a/modules/programs/pistol.nix b/modules/programs/pistol.nix
index 384f63a34..28f7ea975 100644
--- a/modules/programs/pistol.nix
+++ b/modules/programs/pistol.nix
@@ -13,22 +13,19 @@ let
     options = {
       command = mkOption {
         type = types.str;
-        description =
-          lib.mdDoc "Preview command for files matched by this association.";
+        description = "Preview command for files matched by this association.";
       };
 
       fpath = mkOption {
         type = types.str;
         default = "";
-        description =
-          lib.mdDoc "File path regex that this association should match.";
+        description = "File path regex that this association should match.";
       };
 
       mime = mkOption {
         type = types.str;
         default = "";
-        description =
-          lib.mdDoc "Mime type regex that this association should match.";
+        description = "Mime type regex that this association should match.";
       };
     };
   };
@@ -41,8 +38,7 @@ in {
   meta.maintainers = [ hm.maintainers.mtoohey ];
 
   options.programs.pistol = {
-    enable =
-      mkEnableOption (lib.mdDoc "file previewer for terminal file managers");
+    enable = mkEnableOption "file previewer for terminal file managers";
 
     associations = mkOption {
       type = types.listOf association;
@@ -54,7 +50,7 @@ in {
           { fpath = ".*.md$"; command = "sh: bat --paging=never --color=always %pistol-filename% | head -8"; }
         ]
       '';
-      description = lib.mdDoc ''
+      description = ''
         Associations written to the Pistol configuration at
         {file}`$XDG_CONFIG_HOME/pistol/pistol.conf`.
       '';
diff --git a/modules/programs/piston-cli.nix b/modules/programs/piston-cli.nix
index ca485bf5d..c554c596d 100644
--- a/modules/programs/piston-cli.nix
+++ b/modules/programs/piston-cli.nix
@@ -9,13 +9,13 @@ in {
   meta.maintainers = with maintainers; [ ethancedwards8 ];
 
   options.programs.piston-cli = {
-    enable = mkEnableOption (lib.mdDoc "piston-cli, code runner");
+    enable = mkEnableOption "piston-cli, code runner";
 
     package = mkOption {
       type = types.package;
       default = pkgs.piston-cli;
       defaultText = literalExpression "pkgs.piston-cli";
-      description = lib.mdDoc "The piston-cli package to use.";
+      description = "The piston-cli package to use.";
     };
 
     settings = mkOption {
@@ -29,7 +29,7 @@ in {
           prompt_start = ">>>";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/piston-cli/config.yml`.
       '';
diff --git a/modules/programs/pls.nix b/modules/programs/pls.nix
index 332d2738f..c56c4b01f 100644
--- a/modules/programs/pls.nix
+++ b/modules/programs/pls.nix
@@ -16,12 +16,11 @@ in {
   meta.maintainers = [ maintainers.arjan-s ];
 
   options.programs.pls = {
-    enable =
-      mkEnableOption (lib.mdDoc "pls, a modern replacement for {command}`ls`");
+    enable = mkEnableOption "pls, a modern replacement for {command}`ls`";
 
-    package = mkPackageOptionMD pkgs "pls" { };
+    package = mkPackageOption pkgs "pls" { };
 
-    enableAliases = mkEnableOption (lib.mdDoc "recommended pls aliases");
+    enableAliases = mkEnableOption "recommended pls aliases";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/powerline-go.nix b/modules/programs/powerline-go.nix
index 6ddb0aa94..9bc9491b6 100644
--- a/modules/programs/powerline-go.nix
+++ b/modules/programs/powerline-go.nix
@@ -49,13 +49,13 @@ in {
 
   options = {
     programs.powerline-go = {
-      enable = mkEnableOption (lib.mdDoc
-        "Powerline-go, a beautiful and useful low-latency prompt for your shell");
+      enable = mkEnableOption
+        "Powerline-go, a beautiful and useful low-latency prompt for your shell";
 
       modules = mkOption {
         default = null;
         type = types.nullOr (types.listOf types.str);
-        description = lib.mdDoc ''
+        description = ''
           List of module names to load. The list of all available
           modules as well as the choice of default ones are at
           <https://github.com/justjanne/powerline-go>.
@@ -66,7 +66,7 @@ in {
       modulesRight = mkOption {
         default = null;
         type = types.nullOr (types.listOf types.str);
-        description = lib.mdDoc ''
+        description = ''
           List of module names to load to be displayed on the right side.
           Currently not supported by bash. Specifying a value for this
           option will force powerline-go to use the eval format to set
@@ -78,7 +78,7 @@ in {
       newline = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Set to true if the prompt should be on a line of its own.
         '';
         example = true;
@@ -87,7 +87,7 @@ in {
       pathAliases = mkOption {
         default = null;
         type = types.nullOr (types.attrsOf types.str);
-        description = lib.mdDoc ''
+        description = ''
           Pairs of full-path and corresponding desired short name. You
           may use '~' to represent your home directory but you should
           protect it to avoid shell substitution.
@@ -100,7 +100,7 @@ in {
       settings = mkOption {
         default = { };
         type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
-        description = lib.mdDoc ''
+        description = ''
           This can be any key/value pair as described in
           <https://github.com/justjanne/powerline-go>.
         '';
@@ -116,8 +116,7 @@ in {
 
       extraUpdatePS1 = mkOption {
         default = "";
-        description =
-          lib.mdDoc "Shell code to execute after the prompt is set.";
+        description = "Shell code to execute after the prompt is set.";
         example = ''
           PS1=$PS1"NixOS> ";
         '';
diff --git a/modules/programs/pubs.nix b/modules/programs/pubs.nix
index 62c996d65..1d7f0c0de 100644
--- a/modules/programs/pubs.nix
+++ b/modules/programs/pubs.nix
@@ -10,13 +10,13 @@ in {
   meta.maintainers = [ hm.maintainers.loicreynier ];
 
   options.programs.pubs = {
-    enable = mkEnableOption (lib.mdDoc "pubs");
+    enable = mkEnableOption "pubs";
 
     package = mkOption {
       type = types.package;
       default = pkgs.pubs;
       defaultText = literalExpression "pkgs.pubs";
-      description = lib.mdDoc "The package to use for the pubs script.";
+      description = "The package to use for the pubs script.";
     };
 
     extraConfig = mkOption {
@@ -44,7 +44,7 @@ in {
         manual = False
         force_color = False
         ''''';
-      description = lib.mdDoc ''
+      description = ''
         Configuration using syntax written to
         {file}`$HOME/.pubsrc`.
       '';
diff --git a/modules/programs/pyenv.nix b/modules/programs/pyenv.nix
index 20b9a37cd..c2273c676 100644
--- a/modules/programs/pyenv.nix
+++ b/modules/programs/pyenv.nix
@@ -10,19 +10,19 @@ in {
   meta.maintainers = with lib.maintainers; [ tmarkus ];
 
   options.programs.pyenv = {
-    enable = lib.mkEnableOption (lib.mdDoc "pyenv");
+    enable = lib.mkEnableOption "pyenv";
 
     package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.pyenv;
       defaultText = lib.literalExpression "pkgs.pyenv";
-      description = lib.mdDoc "The package to use for pyenv.";
+      description = "The package to use for pyenv.";
     };
 
     enableBashIntegration = lib.mkOption {
       type = lib.types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable pyenv's Bash integration.
       '';
     };
@@ -30,7 +30,7 @@ in {
     enableZshIntegration = lib.mkOption {
       type = lib.types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable pyenv's Zsh integration.
       '';
     };
@@ -38,7 +38,7 @@ in {
     enableFishIntegration = lib.mkOption {
       type = lib.types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable pyenv's Fish integration.
       '';
     };
@@ -48,7 +48,7 @@ in {
       apply = toString;
       default = "${config.xdg.dataHome}/pyenv";
       defaultText = "\${config.xdg.dataHome}/pyenv";
-      description = lib.mdDoc ''
+      description = ''
         The pyenv root directory ({env}`PYENV_ROOT`).
 
         ::: {.note}
diff --git a/modules/programs/pylint.nix b/modules/programs/pylint.nix
index 4c184de7e..e6679b985 100644
--- a/modules/programs/pylint.nix
+++ b/modules/programs/pylint.nix
@@ -10,18 +10,18 @@ let
 in {
   meta.maintainers = [ hm.maintainers.florpe ];
   options.programs.pylint = {
-    enable = mkEnableOption (lib.mdDoc "the pylint Python linter");
+    enable = mkEnableOption "the pylint Python linter";
     package = mkOption {
       type = types.package;
       default = pkgs.python3Packages.pylint;
       defaultText = literalExpression "pkgs.python3Packages.pylint";
-      description = lib.mdDoc "The pylint package to use.";
+      description = "The pylint package to use.";
     };
     settings = mkOption {
       type = iniFormat.type;
       default = { };
       defaultText = literalExpression "{}";
-      description = lib.mdDoc "The pylint configuration.";
+      description = "The pylint configuration.";
     };
   };
   config = mkIf cfg.enable {
diff --git a/modules/programs/pywal.nix b/modules/programs/pywal.nix
index 642b8ffd9..b32f087c3 100644
--- a/modules/programs/pywal.nix
+++ b/modules/programs/pywal.nix
@@ -5,9 +5,7 @@ with lib;
 let cfg = config.programs.pywal;
 
 in {
-  options = {
-    programs.pywal = { enable = mkEnableOption (lib.mdDoc "pywal"); };
-  };
+  options = { programs.pywal = { enable = mkEnableOption "pywal"; }; };
 
   config = mkIf cfg.enable {
 
diff --git a/modules/programs/qutebrowser.nix b/modules/programs/qutebrowser.nix
index 44b49fe78..4de6f3e02 100644
--- a/modules/programs/qutebrowser.nix
+++ b/modules/programs/qutebrowser.nix
@@ -36,19 +36,19 @@ let
 
 in {
   options.programs.qutebrowser = {
-    enable = mkEnableOption (lib.mdDoc "qutebrowser");
+    enable = mkEnableOption "qutebrowser";
 
     package = mkOption {
       type = types.package;
       default = pkgs.qutebrowser;
       defaultText = literalExpression "pkgs.qutebrowser";
-      description = lib.mdDoc "Qutebrowser package to install.";
+      description = "Qutebrowser package to install.";
     };
 
     aliases = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Aliases for commands.
       '';
     };
@@ -56,7 +56,7 @@ in {
     loadAutoconfig = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Load settings configured via the GUI.
       '';
     };
@@ -64,7 +64,7 @@ in {
     searchEngines = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Search engines that can be used via the address bar. Maps a search
         engine name (such as `DEFAULT`, or
         `ddg`) to a URL with a `{}`
@@ -90,7 +90,7 @@ in {
     settings = mkOption {
       type = types.attrsOf types.anything;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Options to add to qutebrowser {file}`config.py` file.
         See <https://qutebrowser.org/doc/help/settings.html>
         for options.
@@ -112,7 +112,7 @@ in {
     keyMappings = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         This setting can be used to map keys to other keys. When the key used
         as dictionary-key is pressed, the binding for the key used as
         dictionary-value is invoked instead. This is useful for global
@@ -125,7 +125,7 @@ in {
     enableDefaultBindings = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Disable to prevent loading default key bindings.
       '';
     };
@@ -133,7 +133,7 @@ in {
     keyBindings = mkOption {
       type = with types; attrsOf (attrsOf (separatedString " ;; "));
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Key bindings mapping keys to commands in different modes. This setting
         is a dictionary containing mode names and dictionaries mapping keys to
         commands: `{mode: {key: command}}` If you want to map
@@ -227,7 +227,7 @@ in {
     quickmarks = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Quickmarks to add to qutebrowser's {file}`quickmarks` file.
         Note that when Home Manager manages your quickmarks, you cannot edit them at runtime.
       '';
@@ -242,7 +242,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra lines added to qutebrowser {file}`config.py` file.
       '';
     };
diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv.nix
index 33ebc74c3..e740c5602 100644
--- a/modules/programs/rbenv.nix
+++ b/modules/programs/rbenv.nix
@@ -10,13 +10,13 @@ let
     options = {
       src = mkOption {
         type = types.path;
-        description = lib.mdDoc ''
+        description = ''
           Path to the plugin folder.
         '';
       };
       name = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           Name of the plugin.
         '';
       };
@@ -27,9 +27,9 @@ in {
   meta.maintainers = [ ];
 
   options.programs.rbenv = {
-    enable = mkEnableOption (lib.mdDoc "rbenv");
+    enable = mkEnableOption "rbenv";
 
-    package = mkPackageOptionMD pkgs "rbenv" { };
+    package = mkPackageOption pkgs "rbenv" { };
 
     plugins = mkOption {
       type = types.listOf pluginModule;
@@ -47,7 +47,7 @@ in {
           }
         ]
       '';
-      description = lib.mdDoc ''
+      description = ''
         rbenv plugins to install in {file}`$HOME/.rbenv/plugins/`.
 
         See <https://github.com/rbenv/rbenv/wiki/Plugins>
@@ -55,15 +55,15 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+    enableBashIntegration = mkEnableOption "Bash integration" // {
       default = true;
     };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
       default = true;
     };
 
-    enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // {
+    enableFishIntegration = mkEnableOption "Fish integration" // {
       default = true;
     };
   };
diff --git a/modules/programs/rbw.nix b/modules/programs/rbw.nix
index 977490ac8..b6369dbc4 100644
--- a/modules/programs/rbw.nix
+++ b/modules/programs/rbw.nix
@@ -13,8 +13,7 @@ let
         email = mkOption {
           type = types.str;
           example = "name@example.com";
-          description =
-            lib.mdDoc "The email address for your bitwarden account.";
+          description = "The email address for your bitwarden account.";
         };
 
         base_url = mkOption {
@@ -22,22 +21,21 @@ let
           default = null;
           example = "bitwarden.example.com";
           description =
-            lib.mdDoc "The base-url for a self-hosted bitwarden installation.";
+            "The base-url for a self-hosted bitwarden installation.";
         };
 
         identity_url = mkOption {
           type = with types; nullOr str;
           default = null;
           example = "identity.example.com";
-          description =
-            lib.mdDoc "The identity url for your bitwarden installation.";
+          description = "The identity url for your bitwarden installation.";
         };
 
         lock_timeout = mkOption {
           type = types.ints.unsigned;
           default = 3600;
           example = 300;
-          description = lib.mdDoc ''
+          description = ''
             The amount of time that your login information should be cached.
           '';
         };
@@ -46,7 +44,7 @@ let
           type = with types; either package (enum pkgs.pinentry.flavors);
           example = "gnome3";
           default = "gtk2";
-          description = lib.mdDoc ''
+          description = ''
             Which pinentry interface to use. Beware that
             `pinentry-gnome3` may not work on non-Gnome
             systems. You can fix it by adding the following to your
@@ -70,13 +68,13 @@ in {
   meta.maintainers = with lib.hm.maintainers; [ ambroisie ];
 
   options.programs.rbw = with lib; {
-    enable = mkEnableOption (lib.mdDoc "rbw, a CLI Bitwarden client");
+    enable = mkEnableOption "rbw, a CLI Bitwarden client";
 
     package = mkOption {
       type = types.package;
       default = pkgs.rbw;
       defaultText = literalExpression "pkgs.rbw";
-      description = lib.mdDoc ''
+      description = ''
         Package providing the {command}`rbw` tool and its
         {command}`rbw-agent` daemon.
       '';
@@ -92,7 +90,7 @@ in {
           pinentry = "gnome3";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         rbw configuration, if not defined the configuration will not be
         managed by Home Manager.
       '';
diff --git a/modules/programs/readline.nix b/modules/programs/readline.nix
index f23c27c33..b8739e37a 100644
--- a/modules/programs/readline.nix
+++ b/modules/programs/readline.nix
@@ -32,7 +32,7 @@ let
 
 in {
   options.programs.readline = {
-    enable = mkEnableOption (lib.mdDoc "readline");
+    enable = mkEnableOption "readline";
 
     bindings = mkOption {
       default = { };
@@ -40,14 +40,14 @@ in {
       example = literalExpression ''
         { "\\C-h" = "backward-kill-word"; }
       '';
-      description = lib.mdDoc "Readline bindings.";
+      description = "Readline bindings.";
     };
 
     variables = mkOption {
       type = with types; attrsOf (either str (either int bool));
       default = { };
       example = { expand-tilde = true; };
-      description = lib.mdDoc ''
+      description = ''
         Readline customization variable assignments.
       '';
     };
@@ -55,14 +55,13 @@ in {
     includeSystemConfig = mkOption {
       type = types.bool;
       default = true;
-      description =
-        lib.mdDoc "Whether to include the system-wide configuration.";
+      description = "Whether to include the system-wide configuration.";
     };
 
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Configuration lines appended unchanged to the end of the
         {file}`~/.inputrc` file.
       '';
diff --git a/modules/programs/ripgrep.nix b/modules/programs/ripgrep.nix
index 6402b4c5b..39b318243 100644
--- a/modules/programs/ripgrep.nix
+++ b/modules/programs/ripgrep.nix
@@ -10,15 +10,15 @@ in {
 
   options = {
     programs.ripgrep = {
-      enable = mkEnableOption (lib.mdDoc "Ripgrep");
+      enable = mkEnableOption "Ripgrep";
 
-      package = mkPackageOptionMD pkgs "ripgrep" { };
+      package = mkPackageOption pkgs "ripgrep" { };
 
       arguments = mkOption {
         type = with types; listOf str;
         default = [ ];
         example = [ "--max-columns-preview" "--colors=line:style:bold" ];
-        description = lib.mdDoc ''
+        description = ''
           List of arguments to pass to ripgrep. Each item is given to ripgrep as
           a single command line argument verbatim.
 
diff --git a/modules/programs/rofi-pass.nix b/modules/programs/rofi-pass.nix
index e45d77b9f..9d3ed7382 100644
--- a/modules/programs/rofi-pass.nix
+++ b/modules/programs/rofi-pass.nix
@@ -10,12 +10,12 @@ in {
   meta.maintainers = [ maintainers.seylerius ];
 
   options.programs.rofi.pass = {
-    enable = mkEnableOption (lib.mdDoc "rofi integration with password-store");
+    enable = mkEnableOption "rofi integration with password-store";
 
     stores = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         Directory roots of your password-stores.
       '';
     };
@@ -28,7 +28,7 @@ in {
         USERNAME_field='user'
         AUTOTYPE_field='autotype'
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration to be added at to the rofi-pass config file.
         Additional examples can be found at
         <https://github.com/carnager/rofi-pass/blob/master/config.example>.
diff --git a/modules/programs/rofi.nix b/modules/programs/rofi.nix
index 80622b0e3..bf11201ba 100644
--- a/modules/programs/rofi.nix
+++ b/modules/programs/rofi.nix
@@ -101,13 +101,13 @@ let
 
 in {
   options.programs.rofi = {
-    enable = mkEnableOption (lib.mdDoc
-      "Rofi: A window switcher, application launcher and dmenu replacement");
+    enable = mkEnableOption
+      "Rofi: A window switcher, application launcher and dmenu replacement";
 
     package = mkOption {
       default = pkgs.rofi;
       type = types.package;
-      description = lib.mdDoc ''
+      description = ''
         Package providing the {command}`rofi` binary.
       '';
       example = literalExpression ''
@@ -118,7 +118,7 @@ in {
     finalPackage = mkOption {
       type = types.package;
       readOnly = true;
-      description = lib.mdDoc ''
+      description = ''
         Resulting customized rofi package.
       '';
     };
@@ -126,7 +126,7 @@ in {
     plugins = mkOption {
       default = [ ];
       type = types.listOf types.package;
-      description = lib.mdDoc ''
+      description = ''
         List of rofi plugins to be installed.
       '';
       example = literalExpression "[ pkgs.rofi-calc ]";
@@ -136,13 +136,13 @@ in {
       default = null;
       type = types.nullOr types.str;
       example = "Droid Sans Mono 14";
-      description = lib.mdDoc "Font to use.";
+      description = "Font to use.";
     };
 
     terminal = mkOption {
       default = null;
       type = types.nullOr types.str;
-      description = lib.mdDoc ''
+      description = ''
         Path to the terminal which will be used to run console applications
       '';
       example = "\${pkgs.gnome.gnome_terminal}/bin/gnome-terminal";
@@ -151,19 +151,19 @@ in {
     cycle = mkOption {
       default = null;
       type = types.nullOr types.bool;
-      description = lib.mdDoc "Whether to cycle through the results list.";
+      description = "Whether to cycle through the results list.";
     };
 
     location = mkOption {
       default = "center";
       type = types.enum (attrNames locationsMap);
-      description = lib.mdDoc "The location rofi appears on the screen.";
+      description = "The location rofi appears on the screen.";
     };
 
     xoffset = mkOption {
       default = 0;
       type = types.int;
-      description = lib.mdDoc ''
+      description = ''
         Offset in the x-axis in pixels relative to the chosen location.
       '';
     };
@@ -171,7 +171,7 @@ in {
     yoffset = mkOption {
       default = 0;
       type = types.int;
-      description = lib.mdDoc ''
+      description = ''
         Offset in the y-axis in pixels relative to the chosen location.
       '';
     };
@@ -208,7 +208,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Name of theme or path to theme file in rasi format or attribute set with
         theme configuration. Available named themes can be viewed using the
         {command}`rofi-theme-selector` tool.
@@ -219,7 +219,7 @@ in {
       default = "${config.xdg.configHome}/rofi/config.rasi";
       defaultText = "$XDG_CONFIG_HOME/rofi/config.rasi";
       type = types.str;
-      description = lib.mdDoc "Path where to put generated configuration file.";
+      description = "Path where to put generated configuration file.";
     };
 
     extraConfig = mkOption {
@@ -232,7 +232,7 @@ in {
         }
       '';
       type = configType;
-      description = lib.mdDoc "Additional configuration to add.";
+      description = "Additional configuration to add.";
     };
 
   };
diff --git a/modules/programs/rtorrent.nix b/modules/programs/rtorrent.nix
index 922a5d328..35c245a2c 100644
--- a/modules/programs/rtorrent.nix
+++ b/modules/programs/rtorrent.nix
@@ -16,12 +16,12 @@ in {
   ];
 
   options.programs.rtorrent = {
-    enable = mkEnableOption (lib.mdDoc "rTorrent");
+    enable = mkEnableOption "rTorrent";
 
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/rtorrent/rtorrent.rc`. See
         <https://github.com/rakshasa/rtorrent/wiki/Config-Guide>
diff --git a/modules/programs/rtx.nix b/modules/programs/rtx.nix
index ea2e91605..5fa9b5631 100644
--- a/modules/programs/rtx.nix
+++ b/modules/programs/rtx.nix
@@ -10,20 +10,19 @@ in {
 
   options = {
     programs.rtx = {
-      enable =
-        mkEnableOption (lib.mdDoc "RTX. Runtime Executor (asdf Rust clone)");
+      enable = mkEnableOption "RTX. Runtime Executor (asdf Rust clone)";
 
-      package = mkPackageOptionMD pkgs "rtx" { };
+      package = mkPackageOption pkgs "rtx" { };
 
-      enableBashIntegration = mkEnableOption (lib.mdDoc "Bash Integration") // {
+      enableBashIntegration = mkEnableOption "Bash Integration" // {
         default = true;
       };
 
-      enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh Integration") // {
+      enableZshIntegration = mkEnableOption "Zsh Integration" // {
         default = true;
       };
 
-      enableFishIntegration = mkEnableOption (lib.mdDoc "Fish Integration") // {
+      enableFishIntegration = mkEnableOption "Fish Integration" // {
         default = true;
       };
 
@@ -41,7 +40,7 @@ in {
             experimental = false;
           };
         '';
-        description = lib.mdDoc ''
+        description = ''
           Settings written to {file}`$XDG_CONFIG_HOME/rtx/config.toml`.
 
           See <https://github.com/jdxcode/rtx#global-config-configrtxconfigtoml>
diff --git a/modules/programs/sagemath.nix b/modules/programs/sagemath.nix
index 46df69abc..70efaca56 100644
--- a/modules/programs/sagemath.nix
+++ b/modules/programs/sagemath.nix
@@ -10,21 +10,20 @@ in {
   meta.maintainers = [ lib.maintainers.kirelagin ];
 
   options.programs.sagemath = {
-    enable =
-      mkEnableOption (lib.mdDoc "SageMath, a mathematics software system");
+    enable = mkEnableOption "SageMath, a mathematics software system";
 
     package = mkOption {
       type = types.package;
       default = pkgs.sage;
       defaultText = literalExpression "pkgs.sage";
-      description = lib.mdDoc "The SageMath package to use.";
+      description = "The SageMath package to use.";
     };
 
     configDir = mkOption {
       type = types.str;
       default = "${config.xdg.configHome}/sage";
       defaultText = literalExpression "\${config.xdg.configHome}/sage";
-      description = lib.mdDoc ''
+      description = ''
         Directory where the {file}`sage.init` file will be stored.
         Note that the upstream default is {file}`~/.sage`,
         but our default is to follow XDG.
@@ -35,7 +34,7 @@ in {
       type = types.str;
       default = "${config.xdg.dataHome}/sage";
       defaultText = literalExpression "\${config.xdg.dataHome}/sage";
-      description = lib.mdDoc ''
+      description = ''
         Location for {env}`DOT_SAGE`.
         Note that the upstream default is {file}`~/.sage`,
         but our default is to follow XDG.
@@ -46,7 +45,7 @@ in {
       type = types.lines;
       default = "";
       example = "%colors linux";
-      description = lib.mdDoc ''
+      description = ''
         Contents of the {file}`init.sage` file that is loaded on startup.
       '';
     };
diff --git a/modules/programs/sbt.nix b/modules/programs/sbt.nix
index d4ae03f31..de14bc6f3 100644
--- a/modules/programs/sbt.nix
+++ b/modules/programs/sbt.nix
@@ -35,18 +35,17 @@ let
       options = {
         org = mkOption {
           type = types.str;
-          description =
-            lib.mdDoc "The organization the artifact is published under.";
+          description = "The organization the artifact is published under.";
         };
 
         artifact = mkOption {
           type = types.str;
-          description = lib.mdDoc "The name of the artifact.";
+          description = "The name of the artifact.";
         };
 
         version = mkOption {
           type = types.str;
-          description = lib.mdDoc "The version of the plugin.";
+          description = "The version of the plugin.";
         };
       };
     };
@@ -55,24 +54,23 @@ let
       options = {
         realm = mkOption {
           type = types.str;
-          description =
-            lib.mdDoc "The realm of the repository you're authenticating to.";
+          description = "The realm of the repository you're authenticating to.";
         };
 
         host = mkOption {
           type = types.str;
-          description = lib.mdDoc
+          description =
             "The hostname of the repository you're authenticating to.";
         };
 
         user = mkOption {
           type = types.str;
-          description = lib.mdDoc "The user you're using to authenticate.";
+          description = "The user you're using to authenticate.";
         };
 
         passwordCommand = mkOption {
           type = types.str;
-          description = lib.mdDoc ''
+          description = ''
             The command that provides the password or authentication token for
             the repository.
           '';
@@ -92,19 +90,19 @@ in {
   meta.maintainers = [ maintainers.kubukoz ];
 
   options.programs.sbt = {
-    enable = mkEnableOption (lib.mdDoc "sbt");
+    enable = mkEnableOption "sbt";
 
     package = mkOption {
       type = types.package;
       default = pkgs.sbt;
       defaultText = literalExpression "pkgs.sbt";
-      description = lib.mdDoc "The package with sbt to be installed.";
+      description = "The package with sbt to be installed.";
     };
 
     baseUserConfigPath = mkOption {
       type = types.str;
       default = ".sbt";
-      description = lib.mdDoc ''
+      description = ''
         Where the sbt configuration files should be located, relative
         {env}`HOME`.
       '';
@@ -127,7 +125,7 @@ in {
           }
         ]
       '';
-      description = lib.mdDoc ''
+      description = ''
         A list of plugins to place in the sbt configuration directory.
       '';
     };
@@ -143,7 +141,7 @@ in {
           passwordCommand = "pass show sbt/user@example.com";
         }]
       '';
-      description = lib.mdDoc ''
+      description = ''
         A list of credentials to define in the sbt configuration directory.
       '';
     };
@@ -161,7 +159,7 @@ in {
           "maven-central"
         ]
       '';
-      description = lib.mdDoc ''
+      description = ''
         A list of repositories to use when resolving dependencies. Defined as a
         list of pre-defined repository or custom repository as a set of name to
         URL. The list will be used populate the `~/.sbt/repositories`
diff --git a/modules/programs/scmpuff.nix b/modules/programs/scmpuff.nix
index af0588876..5f2fba53b 100644
--- a/modules/programs/scmpuff.nix
+++ b/modules/programs/scmpuff.nix
@@ -5,21 +5,21 @@ in {
   meta.maintainers = [ maintainers.cpcloud ];
 
   options.programs.scmpuff = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       scmpuff, a command line tool that allows you to work quicker with Git by
-      substituting numeric shortcuts for files'');
+      substituting numeric shortcuts for files'';
 
     package = mkOption {
       type = types.package;
       default = pkgs.scmpuff;
       defaultText = literalExpression "pkgs.scmpuff";
-      description = lib.mdDoc "Package providing the {command}`scmpuff` tool.";
+      description = "Package providing the {command}`scmpuff` tool.";
     };
 
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -27,7 +27,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -35,7 +35,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable fish integration.
       '';
     };
diff --git a/modules/programs/script-directory.nix b/modules/programs/script-directory.nix
index c1eb761bf..9b0bcab29 100644
--- a/modules/programs/script-directory.nix
+++ b/modules/programs/script-directory.nix
@@ -4,9 +4,9 @@ in {
   meta.maintainers = [ lib.maintainers.janik ];
 
   options.programs.script-directory = {
-    enable = lib.mkEnableOption (lib.mdDoc "script-directory");
+    enable = lib.mkEnableOption "script-directory";
 
-    package = lib.mkPackageOptionMD pkgs "script-directory" { };
+    package = lib.mkPackageOption pkgs "script-directory" { };
 
     settings = lib.mkOption {
       default = { };
@@ -18,7 +18,7 @@ in {
           SD_CAT = "lolcat";
         }
       '';
-      description = lib.mdDoc
+      description =
         "script-directory config, for options take a look at the [documentation](github.com/ianthehenry/sd#options)";
     };
   };
diff --git a/modules/programs/senpai.nix b/modules/programs/senpai.nix
index 9d14f48e4..24256e764 100644
--- a/modules/programs/senpai.nix
+++ b/modules/programs/senpai.nix
@@ -7,12 +7,12 @@ let
   cfgFmt = pkgs.formats.yaml { };
 in {
   options.programs.senpai = {
-    enable = mkEnableOption (lib.mdDoc "senpai");
+    enable = mkEnableOption "senpai";
     package = mkOption {
       type = types.package;
       default = pkgs.senpai;
       defaultText = literalExpression "pkgs.senpai";
-      description = lib.mdDoc "The `senpai` package to use.";
+      description = "The `senpai` package to use.";
     };
     config = mkOption {
       type = types.submodule {
@@ -20,7 +20,7 @@ in {
         options = {
           addr = mkOption {
             type = types.str;
-            description = lib.mdDoc ''
+            description = ''
               The address (host[:port]) of the IRC server. senpai uses TLS
               connections by default unless you specify no-tls option. TLS
               connections default to port 6697, plain-text use port 6667.
@@ -28,7 +28,7 @@ in {
           };
           nick = mkOption {
             type = types.str;
-            description = lib.mdDoc ''
+            description = ''
               Your nickname, sent with a NICK IRC message. It mustn't contain
               spaces or colons (:).
             '';
@@ -36,7 +36,7 @@ in {
           password = mkOption {
             type = types.nullOr types.str;
             default = null;
-            description = lib.mdDoc ''
+            description = ''
               Your password, used for SASL authentication. Note that it will
               reside world-readable in the Nix store.
             '';
@@ -44,7 +44,7 @@ in {
           no-tls = mkOption {
             type = types.bool;
             default = false;
-            description = lib.mdDoc "Disables TLS encryption.";
+            description = "Disables TLS encryption.";
           };
         };
       };
@@ -55,7 +55,7 @@ in {
           password = "verysecurepassword";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration for senpai. For a complete list of options, see
         {manpage}`senpai(5)`.
       '';
diff --git a/modules/programs/sioyek.nix b/modules/programs/sioyek.nix
index 8a5d3d5d9..04a309731 100644
--- a/modules/programs/sioyek.nix
+++ b/modules/programs/sioyek.nix
@@ -14,18 +14,18 @@ let
 in {
   options = {
     programs.sioyek = {
-      enable = mkEnableOption (lib.mdDoc
-        "Sioyek, a PDF viewer designed for reading research papers and technical books");
+      enable = mkEnableOption
+        "Sioyek, a PDF viewer designed for reading research papers and technical books";
 
       package = mkOption {
         default = pkgs.sioyek;
         defaultText = literalExpression "pkgs.sioyek";
         type = types.package;
-        description = lib.mdDoc "Package providing the sioyek binary";
+        description = "Package providing the sioyek binary";
       };
 
       bindings = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Input configuration written to
           {file}`$XDG_CONFIG_HOME/sioyek/keys_user.config`.
           See <https://github.com/ahrm/sioyek/blob/main/pdf_viewer/keys.config>.
@@ -48,7 +48,7 @@ in {
       };
 
       config = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Input configuration written to
           {file}`$XDG_CONFIG_HOME/sioyek/prefs_user.config`.
           See <https://github.com/ahrm/sioyek/blob/main/pdf_viewer/prefs.config>.
diff --git a/modules/programs/skim.nix b/modules/programs/skim.nix
index fbe200aff..2bb17d1b9 100644
--- a/modules/programs/skim.nix
+++ b/modules/programs/skim.nix
@@ -8,20 +8,20 @@ let
 
 in {
   options.programs.skim = {
-    enable = mkEnableOption (lib.mdDoc "skim - a command-line fuzzy finder");
+    enable = mkEnableOption "skim - a command-line fuzzy finder";
 
     package = mkOption {
       type = types.package;
       default = pkgs.skim;
       defaultText = literalExpression "pkgs.skim";
-      description = lib.mdDoc "Package providing the {command}`skim` tool.";
+      description = "Package providing the {command}`skim` tool.";
     };
 
     defaultCommand = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "fd --type f";
-      description = lib.mdDoc ''
+      description = ''
         The command that gets executed as the default source for skim
         when running.
       '';
@@ -31,7 +31,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--height 40%" "--prompt ⟫" ];
-      description = lib.mdDoc ''
+      description = ''
         Extra command line options given to skim by default.
       '';
     };
@@ -40,7 +40,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "fd --type f";
-      description = lib.mdDoc ''
+      description = ''
         The command that gets executed as the source for skim for the
         CTRL-T keybinding.
       '';
@@ -50,7 +50,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--preview 'head {}'" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line options for the CTRL-T keybinding.
       '';
     };
@@ -59,7 +59,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "fd --type d";
-      description = lib.mdDoc ''
+      description = ''
         The command that gets executed as the source for skim for the
         ALT-C keybinding.
       '';
@@ -69,7 +69,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--preview 'tree -C {} | head -200'" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line options for the ALT-C keybinding.
       '';
     };
@@ -78,7 +78,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--tac" "--exact" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line options for the CTRL-R keybinding.
       '';
     };
@@ -86,7 +86,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -94,7 +94,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -102,7 +102,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
diff --git a/modules/programs/sm64ex.nix b/modules/programs/sm64ex.nix
index 3d22b51d7..35d608bab 100644
--- a/modules/programs/sm64ex.nix
+++ b/modules/programs/sm64ex.nix
@@ -32,12 +32,12 @@ in {
   meta.maintainers = [ maintainers.ivar ];
 
   options.programs.sm64ex = {
-    enable = mkEnableOption (lib.mdDoc "sm64ex");
+    enable = mkEnableOption "sm64ex";
 
     package = mkOption {
       type = types.package;
       default = pkgs.sm64ex;
-      description = lib.mdDoc "The sm64ex package to use.";
+      description = "The sm64ex package to use.";
     };
 
     region = mkOption {
@@ -45,7 +45,7 @@ in {
       default = null;
       defaultText =
         literalExpression "us"; # This is set both in nixpkgs and upstream
-      description = lib.mdDoc ''
+      description = ''
         Your baserom's region. Note that only "us", "eu", and "jp" are supported.
       '';
       example = literalExpression "jp";
@@ -54,7 +54,7 @@ in {
     baserom = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc
+      description =
         "The path to the Super Mario 64 baserom to extract assets from.";
       example = literalExpression "/home/foo/baserom.us.z64";
     };
@@ -62,7 +62,7 @@ in {
     extraCompileFlags = mkOption {
       type = with types; nullOr (listOf str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Extra flags to pass to the compiler. See
         <https://github.com/sm64pc/sm64ex/wiki/Build-options>
         for more information.
@@ -79,7 +79,7 @@ in {
       type = with types;
         nullOr (attrsOf (either str (either int (either bool (listOf str)))));
       default = null;
-      description = lib.mdDoc
+      description =
         "Settings for sm64ex's {file}`$XDG_DATA_HOME/sm64pc/sm64config.txt` file.";
       example = literalExpression ''
         {
diff --git a/modules/programs/sqls.nix b/modules/programs/sqls.nix
index 93e062112..aaa161a75 100644
--- a/modules/programs/sqls.nix
+++ b/modules/programs/sqls.nix
@@ -12,8 +12,7 @@ in {
   meta.maintainers = [ ];
 
   options.programs.sqls = {
-    enable =
-      mkEnableOption (lib.mdDoc "sqls, a SQL language server written in Go");
+    enable = mkEnableOption "sqls, a SQL language server written in Go";
 
     settings = mkOption {
       type = yamlFormat.type;
@@ -29,7 +28,7 @@ in {
            ];
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/sqls/config.yml`. See
         <https://github.com/lighttiger2505/sqls#db-configuration>
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index e34ea0e4b..e510fe8aa 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -26,14 +26,14 @@ let
       type = types.str;
       default = "localhost";
       example = "example.org";
-      description = lib.mdDoc "The address where to bind the port.";
+      description = "The address where to bind the port.";
     };
 
     port = mkOption {
       type = types.nullOr types.port;
       default = null;
       example = 8080;
-      description = lib.mdDoc "Specifies port number to bind on bind address.";
+      description = "Specifies port number to bind on bind address.";
     };
   };
 
@@ -50,14 +50,14 @@ let
           type = types.nullOr types.str;
           default = null;
           example = "example.org";
-          description = lib.mdDoc "The address where to forward the traffic to.";
+          description = "The address where to forward the traffic to.";
         };
 
         port = mkOption {
           type = types.nullOr types.port;
           default = null;
           example = 80;
-          description = lib.mdDoc "Specifies port number to forward the traffic to.";
+          description = "Specifies port number to forward the traffic to.";
         };
       };
     };
@@ -69,7 +69,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "*.example.org";
-        description = lib.mdDoc ''
+        description = ''
           `Host` pattern used by this conditional block.
           See
           {manpage}`ssh_config(5)`
@@ -84,7 +84,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "host <hostname> canonical\nhost <hostname> exec \"ping -c1 -q 192.168.17.1\"";
-        description = lib.mdDoc ''
+        description = ''
           `Match` block conditions used by this block. See
           {manpage}`ssh_config(5)`
           for `Match` block details.
@@ -97,13 +97,13 @@ let
       port = mkOption {
         type = types.nullOr types.port;
         default = null;
-        description = lib.mdDoc "Specifies port number to connect on remote host.";
+        description = "Specifies port number to connect on remote host.";
       };
 
       forwardAgent = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Whether the connection to the authentication agent (if any)
           will be forwarded to the remote machine.
         '';
@@ -112,7 +112,7 @@ let
       forwardX11 = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Specifies whether X11 connections will be automatically redirected
           over the secure channel and {env}`DISPLAY` set.
         '';
@@ -121,7 +121,7 @@ let
       forwardX11Trusted = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Specifies whether remote X11 clients will have full access to the
           original X11 display.
         '';
@@ -130,7 +130,7 @@ let
       identitiesOnly = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Specifies that ssh should only use the authentication
           identity explicitly configured in the
           {file}`~/.ssh/config` files or passed on the
@@ -146,7 +146,7 @@ let
           if p == null then []
           else if isString p then [p]
           else p;
-        description = lib.mdDoc ''
+        description = ''
           Specifies files from which the user identity is read.
           Identities will be tried in the given order.
         '';
@@ -155,26 +155,26 @@ let
       user = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "Specifies the user to log in as.";
+        description = "Specifies the user to log in as.";
       };
 
       hostname = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "Specifies the real host name to log into.";
+        description = "Specifies the real host name to log into.";
       };
 
       serverAliveInterval = mkOption {
         type = types.int;
         default = 0;
         description =
-          lib.mdDoc "Set timeout in seconds after which response will be requested.";
+          "Set timeout in seconds after which response will be requested.";
       };
 
       serverAliveCountMax = mkOption {
         type = types.ints.positive;
         default = 3;
-        description = lib.mdDoc ''
+        description = ''
           Sets the number of server alive messages which may be sent
           without SSH receiving any messages back from the server.
         '';
@@ -183,7 +183,7 @@ let
       sendEnv = mkOption {
         type = types.listOf types.str;
         default = [];
-        description = lib.mdDoc ''
+        description = ''
           Environment variables to send from the local host to the
           server.
         '';
@@ -192,7 +192,7 @@ let
       setEnv = mkOption {
         type = with types; attrsOf (oneOf [ str path int float ]);
         default = {};
-        description = lib.mdDoc ''
+        description = ''
           Environment variables and their value to send to the server.
         '';
       };
@@ -200,7 +200,7 @@ let
       compression = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Specifies whether to use compression. Omitted from the host
           block when `null`.
         '';
@@ -209,7 +209,7 @@ let
       checkHostIP = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Check the host IP address in the
           {file}`known_hosts` file.
         '';
@@ -218,13 +218,13 @@ let
       proxyCommand = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The command to use to connect to the server.";
+        description = "The command to use to connect to the server.";
       };
 
       proxyJump = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The proxy host to use to connect to the server.";
+        description = "The proxy host to use to connect to the server.";
       };
 
       certificateFile = mkOption {
@@ -234,7 +234,7 @@ let
           if p == null then []
           else if isString p then [p]
           else p;
-        description = lib.mdDoc ''
+        description = ''
           Specifies files from which the user certificate is read.
         '';
       };
@@ -242,7 +242,7 @@ let
       addressFamily = mkOption {
         default = null;
         type = types.nullOr (types.enum ["any" "inet" "inet6"]);
-        description = lib.mdDoc ''
+        description = ''
           Specifies which address family to use when connecting.
         '';
       };
@@ -259,7 +259,7 @@ let
             }
           ];
         '';
-        description = lib.mdDoc ''
+        description = ''
           Specify local port forwardings. See
           {manpage}`ssh_config(5)` for `LocalForward`.
         '';
@@ -277,7 +277,7 @@ let
             }
           ];
         '';
-        description = lib.mdDoc ''
+        description = ''
           Specify remote port forwardings. See
           {manpage}`ssh_config(5)` for `RemoteForward`.
         '';
@@ -289,7 +289,7 @@ let
         example = literalExpression ''
           [ { port = 8080; } ];
         '';
-        description = lib.mdDoc ''
+        description = ''
           Specify dynamic port forwardings. See
           {manpage}`ssh_config(5)` for `DynamicForward`.
         '';
@@ -298,7 +298,7 @@ let
       extraOptions = mkOption {
         type = types.attrsOf types.str;
         default = {};
-        description = lib.mdDoc "Extra configuration options for the host.";
+        description = "Extra configuration options for the host.";
       };
     };
 
@@ -344,9 +344,9 @@ in
   meta.maintainers = [ maintainers.rycee ];
 
   options.programs.ssh = {
-    enable = mkEnableOption (lib.mdDoc "SSH client configuration");
+    enable = mkEnableOption "SSH client configuration";
 
-    package = mkPackageOptionMD pkgs "openssh" {
+    package = mkPackageOption pkgs "openssh" {
       nullable = true;
       default = null;
       extraDescription = "By default, the client provided by your system is used.";
@@ -355,7 +355,7 @@ in
     forwardAgent = mkOption {
       default = false;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether the connection to the authentication agent (if any)
         will be forwarded to the remote machine.
       '';
@@ -364,13 +364,13 @@ in
     compression = mkOption {
       default = false;
       type = types.bool;
-      description = lib.mdDoc "Specifies whether to use compression.";
+      description = "Specifies whether to use compression.";
     };
 
     serverAliveInterval = mkOption {
       type = types.int;
       default = 0;
-      description = lib.mdDoc ''
+      description = ''
         Set default timeout in seconds after which response will be requested.
       '';
     };
@@ -378,7 +378,7 @@ in
     serverAliveCountMax = mkOption {
       type = types.ints.positive;
       default = 3;
-      description = lib.mdDoc ''
+      description = ''
         Sets the default number of server alive messages which may be
         sent without SSH receiving any messages back from the server.
       '';
@@ -387,7 +387,7 @@ in
     hashKnownHosts = mkOption {
       default = false;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Indicates that
         {manpage}`ssh(1)`
         should hash host names and addresses when they are added to
@@ -398,7 +398,7 @@ in
     userKnownHostsFile = mkOption {
       type = types.str;
       default = "~/.ssh/known_hosts";
-      description = lib.mdDoc ''
+      description = ''
         Specifies one or more files to use for the user host key
         database, separated by whitespace. The default is
         {file}`~/.ssh/known_hosts`.
@@ -408,7 +408,7 @@ in
     controlMaster = mkOption {
       default = "no";
       type = types.enum ["yes" "no" "ask" "auto" "autoask"];
-      description = lib.mdDoc ''
+      description = ''
         Configure sharing of multiple sessions over a single network connection.
       '';
     };
@@ -416,7 +416,7 @@ in
     controlPath = mkOption {
       type = types.str;
       default = "~/.ssh/master-%r@%n:%p";
-      description = lib.mdDoc ''
+      description = ''
         Specify path to the control socket used for connection sharing.
       '';
     };
@@ -425,7 +425,7 @@ in
       type = types.str;
       default = "no";
       example = "10m";
-      description = lib.mdDoc ''
+      description = ''
         Whether control socket should remain open in the background.
       '';
     };
@@ -433,7 +433,7 @@ in
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration.
       '';
     };
@@ -441,7 +441,7 @@ in
     extraOptionOverrides = mkOption {
       type = types.attrsOf types.str;
       default = {};
-      description = lib.mdDoc ''
+      description = ''
         Extra SSH configuration options that take precedence over any
         host specific configuration.
       '';
@@ -450,7 +450,7 @@ in
     includes = mkOption {
       type = types.listOf types.str;
       default = [];
-      description = lib.mdDoc ''
+      description = ''
         File globs of ssh config files that should be included via the
         `Include` directive.
 
@@ -475,7 +475,7 @@ in
           };
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Specify per-host settings. Note, if the order of rules matter
         then use the DAG functions to express the dependencies as
         shown in the example.
diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix
index 52a823550..8a97b53a2 100644
--- a/modules/programs/starship.nix
+++ b/modules/programs/starship.nix
@@ -14,13 +14,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.starship = {
-    enable = mkEnableOption (lib.mdDoc "starship");
+    enable = mkEnableOption "starship";
 
     package = mkOption {
       type = types.package;
       default = pkgs.starship;
       defaultText = literalExpression "pkgs.starship";
-      description = lib.mdDoc "The package to use for the starship binary.";
+      description = "The package to use for the starship binary.";
     };
 
     settings = mkOption {
@@ -49,7 +49,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/starship.toml`.
 
@@ -58,31 +58,30 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+    enableBashIntegration = mkEnableOption "Bash integration" // {
       default = true;
     };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
       default = true;
     };
 
-    enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // {
+    enableFishIntegration = mkEnableOption "Fish integration" // {
       default = true;
     };
 
-    enableIonIntegration = mkEnableOption (lib.mdDoc "Ion integration") // {
+    enableIonIntegration = mkEnableOption "Ion integration" // {
       default = true;
     };
 
-    enableNushellIntegration = mkEnableOption (lib.mdDoc "Nushell integration")
-      // {
-        default = true;
-      };
+    enableNushellIntegration = mkEnableOption "Nushell integration" // {
+      default = true;
+    };
 
     enableTransience = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         The TransientPrompt feature of Starship replaces previous prompts with a
         custom string. This is only a valid option for the Fish shell.
 
diff --git a/modules/programs/swaylock.nix b/modules/programs/swaylock.nix
index 5a0672323..774ecf705 100644
--- a/modules/programs/swaylock.nix
+++ b/modules/programs/swaylock.nix
@@ -16,15 +16,15 @@ in {
         false otherwise
       '';
       example = true;
-      description = lib.mdDoc "Whether to enable swaylock.";
+      description = "Whether to enable swaylock.";
     };
 
-    package = mkPackageOptionMD pkgs "swaylock" { };
+    package = mkPackageOption pkgs "swaylock" { };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool float int str ]);
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Default arguments to {command}`swaylock`. An empty set
         disables configuration generation.
       '';
diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix
index a625159a3..5c4f0bf8a 100644
--- a/modules/programs/taskwarrior.nix
+++ b/modules/programs/taskwarrior.nix
@@ -29,7 +29,7 @@ let
 in {
   options = {
     programs.taskwarrior = {
-      enable = mkEnableOption (lib.mdDoc "Task Warrior");
+      enable = mkEnableOption "Task Warrior";
 
       config = mkOption {
         type = types.attrsOf types.anything;
@@ -49,7 +49,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Key-value configuration written to
           {file}`$XDG_CONFIG_HOME/task/taskrc`.
         '';
@@ -59,7 +59,7 @@ in {
         type = types.str;
         default = "${config.xdg.dataHome}/task";
         defaultText = "$XDG_DATA_HOME/task";
-        description = lib.mdDoc ''
+        description = ''
           Location where Task Warrior will store its data.
 
           Home Manager will attempt to create this directory.
@@ -70,7 +70,7 @@ in {
         type = with types; nullOr (either str path);
         default = null;
         example = "dark-blue-256";
-        description = lib.mdDoc ''
+        description = ''
           Either one of the default provided theme as string, or a
           path to a theme configuration file.
         '';
@@ -79,13 +79,13 @@ in {
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Additional content written at the end of
           {file}`$XDG_CONFIG_HOME/task/taskrc`.
         '';
       };
 
-      package = mkPackageOptionMD pkgs "taskwarrior" { };
+      package = mkPackageOption pkgs "taskwarrior" { };
     };
   };
 
diff --git a/modules/programs/tealdeer.nix b/modules/programs/tealdeer.nix
index cca2a8fc8..f0e610c2d 100644
--- a/modules/programs/tealdeer.nix
+++ b/modules/programs/tealdeer.nix
@@ -15,7 +15,7 @@ in {
   meta.maintainers = [ ];
 
   options.programs.tealdeer = {
-    enable = mkEnableOption (lib.mdDoc "Tealdeer");
+    enable = mkEnableOption "Tealdeer";
 
     settings = mkOption {
       type = tomlFormat.type;
@@ -32,7 +32,7 @@ in {
           };
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/tealdeer/config.toml` on Linux or
         {file}`$HOME/Library/Application Support/tealdeer/config.toml`
diff --git a/modules/programs/terminator.nix b/modules/programs/terminator.nix
index 2a996e2b5..283f4ad9d 100644
--- a/modules/programs/terminator.nix
+++ b/modules/programs/terminator.nix
@@ -31,19 +31,18 @@ in {
   meta.maintainers = [ maintainers.chisui ];
 
   options.programs.terminator = {
-    enable =
-      mkEnableOption (lib.mdDoc "terminator, a tiling terminal emulator");
+    enable = mkEnableOption "terminator, a tiling terminal emulator";
 
     package = mkOption {
       type = types.package;
       default = pkgs.terminator;
       example = literalExpression "pkgs.terminator";
-      description = lib.mdDoc "terminator package to install.";
+      description = "terminator package to install.";
     };
 
     config = mkOption {
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         configuration for terminator.
 
         For a list of all possible options refer to the
diff --git a/modules/programs/termite.nix b/modules/programs/termite.nix
index 58f185926..c0015dcb4 100644
--- a/modules/programs/termite.nix
+++ b/modules/programs/termite.nix
@@ -9,12 +9,12 @@ let
 in {
   options = {
     programs.termite = {
-      enable = mkEnableOption (lib.mdDoc "Termite VTE-based terminal");
+      enable = mkEnableOption "Termite VTE-based terminal";
 
       allowBold = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Allow the output of bold characters when the bold escape sequence appears.
         '';
       };
@@ -22,13 +22,13 @@ in {
       audibleBell = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc "Have the terminal beep on the terminal bell.";
+        description = "Have the terminal beep on the terminal bell.";
       };
 
       clickableUrl = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Auto-detected URLs can be clicked on to open them in  your browser.
           Only enabled if a browser is configured or detected.
         '';
@@ -37,28 +37,26 @@ in {
       dynamicTitle = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Settings dynamic title allows the terminal and the shell to
           update the terminal's title.
         '';
       };
 
-      enableVteIntegration = mkEnableOption (lib.mdDoc "Shell VTE integration")
-        // {
-          default = true;
-        };
+      enableVteIntegration = mkEnableOption "Shell VTE integration" // {
+        default = true;
+      };
 
       fullscreen = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description =
-          lib.mdDoc "Enables entering fullscreen mode by pressing F11.";
+        description = "Enables entering fullscreen mode by pressing F11.";
       };
 
       mouseAutohide = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Automatically hide the mouse pointer when you start typing.
         '';
       };
@@ -66,14 +64,13 @@ in {
       scrollOnOutput = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description =
-          lib.mdDoc "Scroll to the bottom when the shell generates output.";
+        description = "Scroll to the bottom when the shell generates output.";
       };
 
       scrollOnKeystroke = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Scroll to the bottom automatically when a key is pressed.
         '';
       };
@@ -81,30 +78,27 @@ in {
       searchWrap = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description =
-          lib.mdDoc "Search from top again when you hit the bottom.";
+        description = "Search from top again when you hit the bottom.";
       };
 
       urgentOnBell = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description =
-          lib.mdDoc "Sets the window as urgent on the terminal bell.";
+        description = "Sets the window as urgent on the terminal bell.";
       };
 
       font = mkOption {
         default = null;
         example = "Monospace 12";
         type = types.nullOr types.str;
-        description = lib.mdDoc "The font description for the terminal's font.";
+        description = "The font description for the terminal's font.";
       };
 
       geometry = mkOption {
         default = null;
         example = "640x480";
         type = types.nullOr types.str;
-        description =
-          lib.mdDoc "The default window geometry for new terminal windows.";
+        description = "The default window geometry for new terminal windows.";
       };
 
       iconName = mkOption {
@@ -112,14 +106,14 @@ in {
         example = "terminal";
         type = types.nullOr types.str;
         description =
-          lib.mdDoc "The name of the icon to be used for the terminal process.";
+          "The name of the icon to be used for the terminal process.";
       };
 
       scrollbackLines = mkOption {
         default = null;
         example = 10000;
         type = types.nullOr types.int;
-        description = lib.mdDoc
+        description =
           "Set the number of lines to limit the terminal's scrollback.";
       };
 
@@ -127,7 +121,7 @@ in {
         default = null;
         type = types.nullOr types.str;
         example = "${pkgs.xdg-utils}/xdg-open";
-        description = lib.mdDoc ''
+        description = ''
           Set the default browser for opening links. If its not set, $BROWSER is read.
           If that's not set, url hints will be disabled.
         '';
@@ -137,7 +131,7 @@ in {
         default = null;
         example = "system";
         type = types.nullOr (types.enum [ "system" "on" "off" ]);
-        description = lib.mdDoc ''
+        description = ''
           Specify the how the terminal's cursor should behave.
           Accepts system to respect the gtk global configuration,
           on and off to explicitly enable or disable them.
@@ -148,7 +142,7 @@ in {
         default = null;
         example = "block";
         type = types.nullOr (types.enum [ "block" "underline" "ibeam" ]);
-        description = lib.mdDoc ''
+        description = ''
           Specify how the cursor should look. Accepts block, ibeam and underline.
         '';
       };
@@ -156,14 +150,14 @@ in {
       filterUnmatchedUrls = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc
+        description =
           "Whether to hide url hints not matching input in url hints mode.";
       };
 
       modifyOtherKeys = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Emit escape sequences for extra keys,
           like the modifyOtherKeys resource for
           {manpage}`xterm(1)`.
@@ -173,7 +167,7 @@ in {
       sizeHints = mkOption {
         default = null;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Enable size hints. Locks the terminal resizing
           to increments of the terminal's cell size.
           Requires a window manager that respects scroll hints.
@@ -183,112 +177,112 @@ in {
       scrollbar = mkOption {
         default = null;
         type = types.nullOr (types.enum [ "off" "left" "right" ]);
-        description = lib.mdDoc "Scrollbar position.";
+        description = "Scrollbar position.";
       };
 
       backgroundColor = mkOption {
         default = null;
         example = "rgba(63, 63, 63, 0.8)";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Background color value.";
+        description = "Background color value.";
       };
 
       cursorColor = mkOption {
         default = null;
         example = "#dcdccc";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Cursor color value.";
+        description = "Cursor color value.";
       };
 
       cursorForegroundColor = mkOption {
         default = null;
         example = "#dcdccc";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Cursor foreground color value.";
+        description = "Cursor foreground color value.";
       };
 
       foregroundColor = mkOption {
         default = null;
         example = "#dcdccc";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Foreground color value.";
+        description = "Foreground color value.";
       };
 
       foregroundBoldColor = mkOption {
         default = null;
         example = "#ffffff";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Foreground bold color value.";
+        description = "Foreground bold color value.";
       };
 
       highlightColor = mkOption {
         default = null;
         example = "#2f2f2f";
         type = types.nullOr types.str;
-        description = lib.mdDoc "highlight color value.";
+        description = "highlight color value.";
       };
 
       hintsActiveBackgroundColor = mkOption {
         default = null;
         example = "#3f3f3f";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints active background color value.";
+        description = "Hints active background color value.";
       };
 
       hintsActiveForegroundColor = mkOption {
         default = null;
         example = "#e68080";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints active foreground color value.";
+        description = "Hints active foreground color value.";
       };
 
       hintsBackgroundColor = mkOption {
         default = null;
         example = "#3f3f3f";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints background color value.";
+        description = "Hints background color value.";
       };
 
       hintsForegroundColor = mkOption {
         default = null;
         example = "#dcdccc";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints foreground color value.";
+        description = "Hints foreground color value.";
       };
 
       hintsBorderColor = mkOption {
         default = null;
         example = "#3f3f3f";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints border color value.";
+        description = "Hints border color value.";
       };
 
       hintsBorderWidth = mkOption {
         default = null;
         example = "0.5";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints border width.";
+        description = "Hints border width.";
       };
 
       hintsFont = mkOption {
         default = null;
         example = "Monospace 12";
         type = types.nullOr types.str;
-        description = lib.mdDoc "The font description for the hints font.";
+        description = "The font description for the hints font.";
       };
 
       hintsPadding = mkOption {
         default = null;
         example = 2;
         type = types.nullOr types.int;
-        description = lib.mdDoc "Hints padding.";
+        description = "Hints padding.";
       };
 
       hintsRoundness = mkOption {
         default = null;
         example = "0.2";
         type = types.nullOr types.str;
-        description = lib.mdDoc "Hints roundness.";
+        description = "Hints roundness.";
       };
 
       optionsExtra = mkOption {
@@ -296,7 +290,7 @@ in {
         example = "fullscreen = true";
         type = types.lines;
         description =
-          lib.mdDoc "Extra options that should be added to [options] section.";
+          "Extra options that should be added to [options] section.";
       };
 
       colorsExtra = mkOption {
@@ -307,7 +301,7 @@ in {
           color2 = #60b48a
         '';
         type = types.lines;
-        description = lib.mdDoc
+        description =
           "Extra colors options that should be added to [colors] section.";
       };
 
@@ -315,7 +309,7 @@ in {
         default = "";
         example = "border = #3f3f3f";
         type = types.lines;
-        description = lib.mdDoc
+        description =
           "Extra hints options that should be added to [hints] section.";
       };
     };
diff --git a/modules/programs/texlive.nix b/modules/programs/texlive.nix
index 420867eb0..bd17025d4 100644
--- a/modules/programs/texlive.nix
+++ b/modules/programs/texlive.nix
@@ -14,12 +14,12 @@ in {
 
   options = {
     programs.texlive = {
-      enable = mkEnableOption (lib.mdDoc "TeX Live");
+      enable = mkEnableOption "TeX Live";
 
       packageSet = mkOption {
         default = pkgs.texlive;
         defaultText = literalExpression "pkgs.texlive";
-        description = lib.mdDoc "TeX Live package set to use.";
+        description = "TeX Live package set to use.";
       };
 
       extraPackages = mkOption {
@@ -28,12 +28,12 @@ in {
         example = literalExpression ''
           tpkgs: { inherit (tpkgs) collection-fontsrecommended algorithms; }
         '';
-        description = lib.mdDoc "Extra packages available to TeX Live.";
+        description = "Extra packages available to TeX Live.";
       };
 
       package = mkOption {
         type = types.package;
-        description = lib.mdDoc "Resulting customized TeX Live package.";
+        description = "Resulting customized TeX Live package.";
         readOnly = true;
       };
     };
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index d8f5d07f4..8b14628a1 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -124,14 +124,14 @@ in {
 
   options = {
     programs.thunderbird = {
-      enable = mkEnableOption (lib.mdDoc "Thunderbird");
+      enable = mkEnableOption "Thunderbird";
 
       package = mkOption {
         type = types.package;
         default = pkgs.thunderbird;
         defaultText = literalExpression "pkgs.thunderbird";
         example = literalExpression "pkgs.thunderbird-91";
-        description = lib.mdDoc "The Thunderbird package to use.";
+        description = "The Thunderbird package to use.";
       };
 
       profiles = mkOption {
@@ -142,14 +142,14 @@ in {
                 type = types.str;
                 default = name;
                 readOnly = true;
-                description = lib.mdDoc "This profile's name.";
+                description = "This profile's name.";
               };
 
               isDefault = mkOption {
                 type = types.bool;
                 default = false;
                 example = true;
-                description = lib.mdDoc ''
+                description = ''
                   Whether this is a default profile. There must be exactly one
                   default profile.
                 '';
@@ -163,7 +163,7 @@ in {
                     "mail.spellcheck.inline" = false;
                   }
                 '';
-                description = lib.mdDoc ''
+                description = ''
                   Preferences to add to this profile's
                   {file}`user.js`.
                 '';
@@ -173,14 +173,13 @@ in {
                 type = types.bool;
                 default = false;
                 example = true;
-                description =
-                  lib.mdDoc "Allow using external GPG keys with GPGME.";
+                description = "Allow using external GPG keys with GPGME.";
               };
 
               userChrome = mkOption {
                 type = types.lines;
                 default = "";
-                description = lib.mdDoc "Custom Thunderbird user chrome CSS.";
+                description = "Custom Thunderbird user chrome CSS.";
                 example = ''
                   /* Hide tab bar in Thunderbird */
                   #tabs-toolbar {
@@ -192,7 +191,7 @@ in {
               userContent = mkOption {
                 type = types.lines;
                 default = "";
-                description = lib.mdDoc "Custom Thunderbird user content CSS.";
+                description = "Custom Thunderbird user content CSS.";
                 example = ''
                   /* Hide scrollbar on Thunderbird pages */
                   *{scrollbar-width:none !important}
@@ -202,13 +201,13 @@ in {
               extraConfig = mkOption {
                 type = types.lines;
                 default = "";
-                description = lib.mdDoc ''
+                description = ''
                   Extra preferences to add to {file}`user.js`.
                 '';
               };
             };
           }));
-        description = lib.mdDoc "Attribute set of Thunderbird profiles.";
+        description = "Attribute set of Thunderbird profiles.";
       };
 
       settings = mkOption {
@@ -220,7 +219,7 @@ in {
             "privacy.donottrackheader.enabled" = true;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Attribute set of Thunderbird preferences to be added to
           all profiles.
         '';
@@ -232,7 +231,7 @@ in {
         example = false;
         visible = isDarwin;
         readOnly = !isDarwin;
-        description = lib.mdDoc ''
+        description = ''
           Warn to set environment variables before using this module. Only
           relevant on Darwin.
         '';
@@ -243,8 +242,8 @@ in {
       type = with types;
         attrsOf (submodule {
           options.thunderbird = {
-            enable = mkEnableOption
-              (lib.mdDoc "the Thunderbird mail client for this account");
+            enable =
+              mkEnableOption "the Thunderbird mail client for this account";
 
             profiles = mkOption {
               type = with types; listOf str;
@@ -252,7 +251,7 @@ in {
               example = literalExpression ''
                 [ "profile1" "profile2" ]
               '';
-              description = lib.mdDoc ''
+              description = ''
                 List of Thunderbird profiles for which this account should be
                 enabled. If this list is empty (the default), this account will
                 be enabled for all declared profiles.
@@ -268,7 +267,7 @@ in {
                   "mail.server.server_''${id}.check_new_mail" = false;
                 };
               '';
-              description = lib.mdDoc ''
+              description = ''
                 Extra settings to add to this Thunderbird account configuration.
                 The {var}`id` given as argument is an automatically
                 generated account identifier.
@@ -285,7 +284,7 @@ in {
                   "mail.identity.id_''${id}.autoEncryptDrafts" = false;
                 };
               '';
-              description = lib.mdDoc ''
+              description = ''
                 Extra settings to add to each identity of this Thunderbird
                 account configuration. The {var}`id` given as
                 argument is an automatically generated identifier.
diff --git a/modules/programs/timidity.nix b/modules/programs/timidity.nix
index 61b86aaf8..26b9de982 100644
--- a/modules/programs/timidity.nix
+++ b/modules/programs/timidity.nix
@@ -8,20 +8,19 @@ in {
   meta.maintainers = [ lib.hm.maintainers.amesgen ];
 
   options.programs.timidity = {
-    enable =
-      lib.mkEnableOption (lib.mdDoc "timidity, a software MIDI renderer");
+    enable = lib.mkEnableOption "timidity, a software MIDI renderer";
 
     package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.timidity;
       defaultText = lib.literalExpression "pkgs.timidity";
-      description = lib.mdDoc "The timidity package to use.";
+      description = "The timidity package to use.";
     };
 
     finalPackage = lib.mkOption {
       readOnly = true;
       type = lib.types.package;
-      description = lib.mdDoc "Resulting package.";
+      description = "Resulting package.";
     };
 
     extraConfig = lib.mkOption {
@@ -32,7 +31,7 @@ in {
           soundfont ''${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2
         '''
       '';
-      description = lib.mdDoc "Extra configuration.";
+      description = "Extra configuration.";
     };
   };
 
diff --git a/modules/programs/tint2.nix b/modules/programs/tint2.nix
index dcf43bd44..70930197f 100644
--- a/modules/programs/tint2.nix
+++ b/modules/programs/tint2.nix
@@ -10,20 +10,20 @@ in {
   meta.maintainers = [ hm.maintainers.CarlosLoboxyz ];
 
   options.programs.tint2 = {
-    enable = mkEnableOption
-      (lib.mdDoc "tint2, a simple, unobtrusive and light panel for Xorg");
+    enable =
+      mkEnableOption "tint2, a simple, unobtrusive and light panel for Xorg";
 
     package = mkOption {
       type = types.package;
       default = pkgs.tint2;
       defaultText = literalExpression "pkgs.tint2";
-      description = lib.mdDoc "Tint2 package to install.";
+      description = "Tint2 package to install.";
     };
 
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Commands for tint2 that will be add to the {file}`tint2rc`
         file.
       '';
diff --git a/modules/programs/tiny.nix b/modules/programs/tiny.nix
index 7c7a32978..7c510535f 100644
--- a/modules/programs/tiny.nix
+++ b/modules/programs/tiny.nix
@@ -13,14 +13,13 @@ in {
 
   options = {
     programs.tiny = {
-      enable =
-        mkEnableOption (lib.mdDoc "tiny, a TUI IRC client written in Rust");
+      enable = mkEnableOption "tiny, a TUI IRC client written in Rust";
 
       package = mkOption {
         type = types.package;
         default = pkgs.tiny;
         defaultText = literalExpression "pkgs.tiny";
-        description = lib.mdDoc "The {command}`tiny` package to install.";
+        description = "The {command}`tiny` package to install.";
       };
 
       settings = mkOption {
@@ -46,7 +45,7 @@ in {
             };
           };
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/tiny/config.yml`. See
           <https://github.com/osa1/tiny/blob/master/crates/tiny/config.yml>
diff --git a/modules/programs/tmate.nix b/modules/programs/tmate.nix
index 846fab84a..e895647fb 100644
--- a/modules/programs/tmate.nix
+++ b/modules/programs/tmate.nix
@@ -11,28 +11,28 @@ in {
 
   options = {
     programs.tmate = {
-      enable = mkEnableOption (lib.mdDoc "tmate");
+      enable = mkEnableOption "tmate";
 
       package = mkOption {
         type = types.package;
         default = pkgs.tmate;
         defaultText = literalExpression "pkgs.tmate";
         example = literalExpression "pkgs.tmate";
-        description = lib.mdDoc "The tmate package to install.";
+        description = "The tmate package to install.";
       };
 
       host = mkOption {
         type = with types; nullOr str;
         default = null;
         example = literalExpression "tmate.io";
-        description = lib.mdDoc "Tmate server address.";
+        description = "Tmate server address.";
       };
 
       port = mkOption {
         type = with types; nullOr port;
         default = null;
         example = 2222;
-        description = lib.mdDoc "Tmate server port.";
+        description = "Tmate server port.";
       };
 
       dsaFingerprint = mkOption {
@@ -40,7 +40,7 @@ in {
         default = null;
         example = literalExpression
           "SHA256:1111111111111111111111111111111111111111111";
-        description = lib.mdDoc "Tmate server EdDSA key fingerprint.";
+        description = "Tmate server EdDSA key fingerprint.";
       };
 
       rsaFingerprint = mkOption {
@@ -48,13 +48,13 @@ in {
         default = null;
         example = literalExpression
           "SHA256:1111111111111111111111111111111111111111111";
-        description = lib.mdDoc "Tmate server RSA key fingerprint.";
+        description = "Tmate server RSA key fingerprint.";
       };
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Additional content written at the end of
           {file}`~/.tmate.conf`.
         '';
diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index fd0f0ac1d..b68fd8d5e 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -12,13 +12,12 @@ let
     options = {
       plugin = mkOption {
         type = types.package;
-        description = lib.mdDoc "Path of the configuration file to include.";
+        description = "Path of the configuration file to include.";
       };
 
       extraConfig = mkOption {
         type = types.lines;
-        description =
-          lib.mdDoc "Additional configuration for the associated plugin.";
+        description = "Additional configuration for the associated plugin.";
         default = "";
       };
     };
@@ -135,7 +134,7 @@ in {
       aggressiveResize = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Resize the window to the size of the smallest session for
           which it is the current window.
         '';
@@ -145,19 +144,19 @@ in {
         default = 0;
         example = 1;
         type = types.ints.unsigned;
-        description = lib.mdDoc "Base index for windows and panes.";
+        description = "Base index for windows and panes.";
       };
 
       clock24 = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc "Use 24 hour clock.";
+        description = "Use 24 hour clock.";
       };
 
       customPaneNavigationAndResize = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Override the hjkl and HJKL bindings for pane navigation and
           resizing in VI mode.
         '';
@@ -166,18 +165,18 @@ in {
       disableConfirmationPrompt = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Disable confirmation prompt before killing a pane or window
         '';
       };
 
-      enable = mkEnableOption (lib.mdDoc "tmux");
+      enable = mkEnableOption "tmux";
 
       escapeTime = mkOption {
         default = 500;
         example = 0;
         type = types.ints.unsigned;
-        description = lib.mdDoc ''
+        description = ''
           Time in milliseconds for which tmux waits after an escape is
           input.
         '';
@@ -186,7 +185,7 @@ in {
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Additional configuration to add to
           {file}`tmux.conf`.
         '';
@@ -196,23 +195,22 @@ in {
         default = 2000;
         example = 5000;
         type = types.ints.positive;
-        description =
-          lib.mdDoc "Maximum number of lines held in window history.";
+        description = "Maximum number of lines held in window history.";
       };
 
       keyMode = mkOption {
         default = defaultKeyMode;
         example = "vi";
         type = types.enum [ "emacs" "vi" ];
-        description = lib.mdDoc "VI or Emacs style shortcuts.";
+        description = "VI or Emacs style shortcuts.";
       };
 
-      mouse = mkEnableOption (lib.mdDoc "mouse support");
+      mouse = mkEnableOption "mouse support";
 
       newSession = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Automatically spawn a session if trying to attach and none
           are running.
         '';
@@ -223,26 +221,26 @@ in {
         default = pkgs.tmux;
         defaultText = literalExpression "pkgs.tmux";
         example = literalExpression "pkgs.tmux";
-        description = lib.mdDoc "The tmux package to install";
+        description = "The tmux package to install";
       };
 
       reverseSplit = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc "Reverse the window split shortcuts.";
+        description = "Reverse the window split shortcuts.";
       };
 
       resizeAmount = mkOption {
         default = defaultResize;
         example = 10;
         type = types.ints.positive;
-        description = lib.mdDoc "Number of lines/columns when resizing.";
+        description = "Number of lines/columns when resizing.";
       };
 
       sensibleOnTop = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Run the sensible plugin at the top of the configuration. It
           is possible to override the sensible settings using the
           {option}`programs.tmux.extraConfig` option.
@@ -253,7 +251,7 @@ in {
         default = null;
         example = "C-a";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set the prefix key. Overrules the "shortcut" option when set.
         '';
       };
@@ -262,7 +260,7 @@ in {
         default = defaultShortcut;
         example = "a";
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           CTRL following by this key is used as the main shortcut.
         '';
       };
@@ -271,36 +269,36 @@ in {
         default = defaultTerminal;
         example = "screen-256color";
         type = types.str;
-        description = lib.mdDoc "Set the $TERM variable.";
+        description = "Set the $TERM variable.";
       };
 
       shell = mkOption {
         default = defaultShell;
         example = "\${pkgs.zsh}/bin/zsh";
         type = with types; nullOr str;
-        description = lib.mdDoc "Set the default-shell tmux variable.";
+        description = "Set the default-shell tmux variable.";
       };
 
       secureSocket = mkOption {
         default = pkgs.stdenv.isLinux;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Store tmux socket under {file}`/run`, which is more
           secure than {file}`/tmp`, but as a downside it doesn't
           survive user logout.
         '';
       };
 
-      tmuxp.enable = mkEnableOption (lib.mdDoc "tmuxp");
+      tmuxp.enable = mkEnableOption "tmuxp";
 
-      tmuxinator.enable = mkEnableOption (lib.mdDoc "tmuxinator");
+      tmuxinator.enable = mkEnableOption "tmuxinator";
 
       plugins = mkOption {
         type = with types;
           listOf (either package pluginModule) // {
             description = "list of plugin packages or submodules";
           };
-        description = lib.mdDoc ''
+        description = ''
           List of tmux plugins to be included at the end of your tmux
           configuration. The sensible plugin, however, is defaulted to
           run at the top of your configuration.
diff --git a/modules/programs/topgrade.nix b/modules/programs/topgrade.nix
index 5572bacdf..a49f897ba 100644
--- a/modules/programs/topgrade.nix
+++ b/modules/programs/topgrade.nix
@@ -13,13 +13,13 @@ in {
   meta.maintainers = [ hm.maintainers.msfjarvis ];
 
   options.programs.topgrade = {
-    enable = mkEnableOption (lib.mdDoc "topgrade");
+    enable = mkEnableOption "topgrade";
 
     package = mkOption {
       type = types.package;
       default = pkgs.topgrade;
       defaultText = literalExpression "pkgs.topgrade";
-      description = lib.mdDoc "The package to use for the topgrade binary.";
+      description = "The package to use for the topgrade binary.";
     };
 
     settings = mkOption {
@@ -40,7 +40,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/topgrade.toml`.
 
diff --git a/modules/programs/translate-shell.nix b/modules/programs/translate-shell.nix
index f40008974..1eb3e125b 100644
--- a/modules/programs/translate-shell.nix
+++ b/modules/programs/translate-shell.nix
@@ -25,7 +25,7 @@ in {
   meta.maintainers = [ ];
 
   options.programs.translate-shell = {
-    enable = mkEnableOption (lib.mdDoc "translate-shell");
+    enable = mkEnableOption "translate-shell";
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool str (listOf str) ]);
@@ -35,7 +35,7 @@ in {
         hl = "en";
         tl = [ "es" "fr" ];
       };
-      description = lib.mdDoc ''
+      description = ''
         Options to add to {file}`$XDG_CONFIG_HOME/translate-shell/init.trans` file.
         See <https://github.com/soimort/translate-shell/wiki/Configuration>
         for options.
diff --git a/modules/programs/urxvt.nix b/modules/programs/urxvt.nix
index 3aaed9516..059666c38 100644
--- a/modules/programs/urxvt.nix
+++ b/modules/programs/urxvt.nix
@@ -8,26 +8,26 @@ let
 
 in {
   options.programs.urxvt = {
-    enable = mkEnableOption (lib.mdDoc "rxvt-unicode terminal emulator");
+    enable = mkEnableOption "rxvt-unicode terminal emulator";
 
     package = mkOption {
       type = types.package;
       default = pkgs.rxvt-unicode;
       defaultText = literalExpression "pkgs.rxvt-unicode";
-      description = lib.mdDoc "rxvt-unicode package to install.";
+      description = "rxvt-unicode package to install.";
     };
 
     fonts = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description = lib.mdDoc "List of fonts to be used.";
+      description = "List of fonts to be used.";
       example = [ "xft:Droid Sans Mono Nerd Font:size=9" ];
     };
 
     keybindings = mkOption {
       type = types.attrsOf types.str;
       default = { };
-      description = lib.mdDoc "Mapping of keybindings to actions";
+      description = "Mapping of keybindings to actions";
       example = literalExpression ''
         {
           "Shift-Control-C" = "eval:selection_to_clipboard";
@@ -39,7 +39,7 @@ in {
     iso14755 = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc
+      description =
         "ISO14755 support for viewing and entering unicode characters.";
     };
 
@@ -50,84 +50,82 @@ in {
             enable = mkOption {
               type = types.bool;
               default = true;
-              description = lib.mdDoc "Whether to enable the scrollbar";
+              description = "Whether to enable the scrollbar";
             };
 
             style = mkOption {
               type = types.enum [ "rxvt" "plain" "next" "xterm" ];
               default = "plain";
-              description = lib.mdDoc "Scrollbar style.";
+              description = "Scrollbar style.";
             };
 
             align = mkOption {
               type = types.enum [ "top" "bottom" "center" ];
               default = "center";
-              description = lib.mdDoc "Scrollbar alignment.";
+              description = "Scrollbar alignment.";
             };
 
             position = mkOption {
               type = types.enum [ "left" "right" ];
               default = "right";
-              description = lib.mdDoc "Scrollbar position.";
+              description = "Scrollbar position.";
             };
 
             floating = mkOption {
               type = types.bool;
               default = true;
-              description = lib.mdDoc
+              description =
                 "Whether to display an rxvt scrollbar without a trough.";
             };
           };
         };
         default = { };
-        description = lib.mdDoc "Scrollbar settings.";
+        description = "Scrollbar settings.";
       };
 
       lines = mkOption {
         type = types.ints.unsigned;
         default = 10000;
-        description =
-          lib.mdDoc "Number of lines to save in the scrollback buffer.";
+        description = "Number of lines to save in the scrollback buffer.";
       };
 
       keepPosition = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc
+        description =
           "Whether to keep a scroll position when TTY receives new lines.";
       };
 
       scrollOnKeystroke = mkOption {
         type = types.bool;
         default = true;
-        description =
-          lib.mdDoc "Whether to scroll to bottom on keyboard input.";
+        description = "Whether to scroll to bottom on keyboard input.";
       };
 
       scrollOnOutput = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Whether to scroll to bottom on TTY output.";
+        description = "Whether to scroll to bottom on TTY output.";
       };
     };
 
     transparent = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc "Whether to enable pseudo-transparency.";
+      description = "Whether to enable pseudo-transparency.";
     };
 
     shading = mkOption {
       type = types.ints.between 0 200;
       default = 100;
-      description = lib.mdDoc
+      description =
         "Darken (0 to 99) or lighten (101 to 200) the transparent background.";
     };
 
     extraConfig = mkOption {
       default = { };
       type = types.attrsOf types.anything;
-      description = lib.mdDoc "Additional configuration to add.";
+      description = "Additional configuration to add.";
       example = { "shading" = 15; };
     };
 
diff --git a/modules/programs/vdirsyncer-accounts.nix b/modules/programs/vdirsyncer-accounts.nix
index 27f9ad6b0..35badb927 100644
--- a/modules/programs/vdirsyncer-accounts.nix
+++ b/modules/programs/vdirsyncer-accounts.nix
@@ -8,12 +8,12 @@ let
 
 in {
   options.vdirsyncer = {
-    enable = mkEnableOption (lib.mdDoc "synchronization using vdirsyncer");
+    enable = mkEnableOption "synchronization using vdirsyncer";
 
     collections = mkOption {
       type = types.nullOr (types.listOf collection);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         The collections to synchronize between the storages.
       '';
     };
@@ -23,7 +23,7 @@ in {
         (types.either (types.enum [ "remote wins" "local wins" ])
           (types.listOf types.str));
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         What to do in case of a conflict between the storages. Either
         `remote wins` or
         `local wins` or
@@ -35,7 +35,7 @@ in {
     partialSync = mkOption {
       type = types.nullOr (types.enum [ "revert" "error" "ignore" ]);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         What should happen if synchronization in one direction
         is impossible due to one storage being read-only.
         Defaults to `revert`.
@@ -50,7 +50,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "color" "displayname" ];
-      description = lib.mdDoc ''
+      description = ''
         Metadata keys that should be synchronized when vdirsyncer
         metasync is executed.
       '';
@@ -61,17 +61,17 @@ in {
         options = {
           start = mkOption {
             type = types.str;
-            description = lib.mdDoc "Start of time range to show.";
+            description = "Start of time range to show.";
           };
 
           end = mkOption {
             type = types.str;
-            description = lib.mdDoc "End of time range to show.";
+            description = "End of time range to show.";
           };
         };
       });
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         A time range to synchronize. start and end can be any Python
         expression that returns a `datetime.datetime`
         object.
@@ -85,7 +85,7 @@ in {
     itemTypes = mkOption {
       type = types.nullOr (types.listOf types.str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Kinds of items to show. The default is to show everything.
         This depends on particular features of the server, the results
         are not validated.
@@ -95,13 +95,13 @@ in {
     verify = mkOption {
       type = types.nullOr types.bool;
       default = null;
-      description = lib.mdDoc "Verify SSL certificate.";
+      description = "Verify SSL certificate.";
     };
 
     verifyFingerprint = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Optional. SHA1 or MD5 fingerprint of the expected server certificate.
 
         See
@@ -113,7 +113,7 @@ in {
     auth = mkOption {
       type = types.nullOr (types.enum [ "basic" "digest" "guess" ]);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Authentication settings. The default is `basic`.
       '';
     };
@@ -121,7 +121,7 @@ in {
     authCert = mkOption {
       type = types.nullOr (types.either types.str (types.listOf types.str));
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Either a path to a certificate with a client certificate and
         the key or a list of paths to the files with them.
       '';
@@ -130,7 +130,7 @@ in {
     userAgent = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         The user agent to report to the server. Defaults to
         `vdirsyncer`.
       '';
@@ -139,7 +139,7 @@ in {
     postHook = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Command to call for each item creation and modification.
         The command will be called with the path of the new/updated
         file.
@@ -151,7 +151,7 @@ in {
     tokenFile = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         A file path where access tokens are stored.
       '';
     };
@@ -160,7 +160,7 @@ in {
       type = types.nullOr (types.listOf types.str);
       default = null;
       example = [ "pass" "client_id" ];
-      description = lib.mdDoc ''
+      description = ''
         A command that prints the OAuth credentials to standard
         output.
 
@@ -174,7 +174,7 @@ in {
       type = types.nullOr (types.listOf types.str);
       default = null;
       example = [ "pass" "client_secret" ];
-      description = lib.mdDoc ''
+      description = ''
         A command that prints the OAuth credentials to standard
         output.
 
diff --git a/modules/programs/vdirsyncer.nix b/modules/programs/vdirsyncer.nix
index 89adba96e..ec1b38796 100644
--- a/modules/programs/vdirsyncer.nix
+++ b/modules/programs/vdirsyncer.nix
@@ -167,13 +167,13 @@ let
 in {
   options = {
     programs.vdirsyncer = {
-      enable = mkEnableOption (lib.mdDoc "vdirsyncer");
+      enable = mkEnableOption "vdirsyncer";
 
       package = mkOption {
         type = types.package;
         default = pkgs.vdirsyncer;
         defaultText = "pkgs.vdirsyncer";
-        description = lib.mdDoc ''
+        description = ''
           vdirsyncer package to use.
         '';
       };
@@ -182,7 +182,7 @@ in {
         type = types.str;
         default = "${config.xdg.dataHome}/vdirsyncer/status";
         defaultText = "$XDG_DATA_HOME/vdirsyncer/status";
-        description = lib.mdDoc ''
+        description = ''
           A directory where vdirsyncer will store some additional data for the next sync.
 
           For more information, see the
diff --git a/modules/programs/vim-vint.nix b/modules/programs/vim-vint.nix
index bafcc69b1..9565a8cb3 100644
--- a/modules/programs/vim-vint.nix
+++ b/modules/programs/vim-vint.nix
@@ -13,13 +13,13 @@ in {
 
   options = {
     programs.vim-vint = {
-      enable = mkEnableOption (lib.mdDoc "the Vint linter for Vimscript");
-      package = mkPackageOptionMD pkgs "vim-vint" { };
+      enable = mkEnableOption "the Vint linter for Vimscript";
+      package = mkPackageOption pkgs "vim-vint" { };
 
       settings = mkOption {
         type = yamlFormat.type;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/.vintrc.yaml`
         '';
diff --git a/modules/programs/vim.nix b/modules/programs/vim.nix
index 56d8aa818..2f13caeee 100644
--- a/modules/programs/vim.nix
+++ b/modules/programs/vim.nix
@@ -63,13 +63,13 @@ let
 in {
   options = {
     programs.vim = {
-      enable = mkEnableOption (lib.mdDoc "Vim");
+      enable = mkEnableOption "Vim";
 
       plugins = mkOption {
         type = with types; listOf (either str package);
         default = defaultPlugins;
         example = literalExpression "[ pkgs.vimPlugins.YankRing ]";
-        description = lib.mdDoc ''
+        description = ''
           List of vim plugins to install. To get a list of supported plugins run:
           {command}`nix-env -f '<nixpkgs>' -qaP -A vimPlugins`.
 
@@ -87,7 +87,7 @@ in {
             background = "dark";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           At attribute set of Vim settings. The attribute names and
           corresponding values must be among the following supported
           options.
@@ -110,18 +110,18 @@ in {
           set nocompatible
           set nobackup
         '';
-        description = lib.mdDoc "Custom .vimrc lines";
+        description = "Custom .vimrc lines";
       };
 
       package = mkOption {
         type = types.package;
-        description = lib.mdDoc "Resulting customized vim package";
+        description = "Resulting customized vim package";
         readOnly = true;
       };
 
       packageConfigurable = mkOption {
         type = types.package;
-        description = lib.mdDoc "Vim package to customize";
+        description = "Vim package to customize";
         default = pkgs.vim-full or pkgs.vim_configurable;
         defaultText = literalExpression "pkgs.vim-full";
         example = literalExpression "pkgs.vim";
@@ -130,7 +130,7 @@ in {
       defaultEditor = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to configure {command}`vim` as the default
           editor using the {env}`EDITOR` environment variable.
         '';
diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
index b27975460..5ea6be8b4 100644
--- a/modules/programs/vscode.nix
+++ b/modules/programs/vscode.nix
@@ -60,14 +60,14 @@ in {
 
   options = {
     programs.vscode = {
-      enable = mkEnableOption (lib.mdDoc "Visual Studio Code");
+      enable = mkEnableOption "Visual Studio Code";
 
       package = mkOption {
         type = types.package;
         default = pkgs.vscode;
         defaultText = literalExpression "pkgs.vscode";
         example = literalExpression "pkgs.vscodium";
-        description = lib.mdDoc ''
+        description = ''
           Version of Visual Studio Code to install.
         '';
       };
@@ -75,7 +75,7 @@ in {
       enableUpdateCheck = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable update checks/notifications.
         '';
       };
@@ -83,7 +83,7 @@ in {
       enableExtensionUpdateCheck = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable update notifications for extensions.
         '';
       };
@@ -97,7 +97,7 @@ in {
             "[nix]"."editor.tabSize" = 2;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to Visual Studio Code's
           {file}`settings.json`.
         '';
@@ -118,7 +118,7 @@ in {
             ];
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to Visual Studio Code's
           {file}`tasks.json`.
         '';
@@ -130,20 +130,20 @@ in {
             key = mkOption {
               type = types.str;
               example = "ctrl+c";
-              description = lib.mdDoc "The key or key-combination to bind.";
+              description = "The key or key-combination to bind.";
             };
 
             command = mkOption {
               type = types.str;
               example = "editor.action.clipboardCopyAction";
-              description = lib.mdDoc "The VS Code command to execute.";
+              description = "The VS Code command to execute.";
             };
 
             when = mkOption {
               type = types.nullOr (types.str);
               default = null;
               example = "textInputFocus";
-              description = lib.mdDoc "Optional context filter.";
+              description = "Optional context filter.";
             };
 
             # https://code.visualstudio.com/docs/getstarted/keybindings#_command-arguments
@@ -151,7 +151,7 @@ in {
               type = types.nullOr (jsonFormat.type);
               default = null;
               example = { direction = "up"; };
-              description = lib.mdDoc "Optional arguments for a command.";
+              description = "Optional arguments for a command.";
             };
           };
         });
@@ -165,7 +165,7 @@ in {
             }
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           Keybindings written to Visual Studio Code's
           {file}`keybindings.json`.
         '';
@@ -175,7 +175,7 @@ in {
         type = types.listOf types.package;
         default = [ ];
         example = literalExpression "[ pkgs.vscode-extensions.bbenoist.nix ]";
-        description = lib.mdDoc ''
+        description = ''
           The extensions Visual Studio Code should be started with.
         '';
       };
@@ -184,7 +184,7 @@ in {
         type = types.bool;
         default = true;
         example = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether extensions can be installed or updated manually
           or by Visual Studio Code.
         '';
@@ -202,8 +202,7 @@ in {
             };
           };
         };
-        description =
-          lib.mdDoc "Defines user snippets for different languages.";
+        description = "Defines user snippets for different languages.";
       };
 
       globalSnippets = mkOption {
@@ -216,7 +215,7 @@ in {
             description = "Insert a FIXME remark";
           };
         };
-        description = lib.mdDoc "Defines global user snippets.";
+        description = "Defines global user snippets.";
       };
     };
   };
diff --git a/modules/programs/vscode/haskell.nix b/modules/programs/vscode/haskell.nix
index a2f2147ad..63ecd18e2 100644
--- a/modules/programs/vscode/haskell.nix
+++ b/modules/programs/vscode/haskell.nix
@@ -23,21 +23,19 @@ let
 
 in {
   options.programs.vscode.haskell = {
-    enable =
-      mkEnableOption (lib.mdDoc "Haskell integration for Visual Studio Code");
+    enable = mkEnableOption "Haskell integration for Visual Studio Code";
 
     hie.enable = mkOption {
       type = types.bool;
       default = true;
-      description =
-        lib.mdDoc "Whether to enable Haskell IDE engine integration.";
+      description = "Whether to enable Haskell IDE engine integration.";
     };
 
     hie.executablePath = mkOption {
       type = types.path;
       default = defaultHieNixExe;
       defaultText = defaultHieNixExeText;
-      description = lib.mdDoc ''
+      description = ''
         The path to the Haskell IDE Engine executable.
 
         Because hie-nix is not packaged in Nixpkgs, you need to add it as an
diff --git a/modules/programs/watson.nix b/modules/programs/watson.nix
index 3fa9b1466..b30dec096 100644
--- a/modules/programs/watson.nix
+++ b/modules/programs/watson.nix
@@ -17,35 +17,31 @@ in {
   meta.maintainers = [ maintainers.polykernel ];
 
   options.programs.watson = {
-    enable =
-      mkEnableOption (lib.mdDoc "watson, a wonderful CLI to track your time");
+    enable = mkEnableOption "watson, a wonderful CLI to track your time";
 
     package = mkOption {
       type = types.package;
       default = pkgs.watson;
       defaultText = literalExpression "pkgs.watson";
-      description = lib.mdDoc "Package providing the {command}`watson`.";
+      description = "Package providing the {command}`watson`.";
     };
 
-    enableBashIntegration =
-      mkEnableOption (lib.mdDoc "watson's bash integration") // {
-        default = true;
-      };
+    enableBashIntegration = mkEnableOption "watson's bash integration" // {
+      default = true;
+    };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "watson's zsh integration")
-      // {
-        default = true;
-      };
+    enableZshIntegration = mkEnableOption "watson's zsh integration" // {
+      default = true;
+    };
 
-    enableFishIntegration =
-      mkEnableOption (lib.mdDoc "watson's fish integration") // {
-        default = true;
-      };
+    enableFishIntegration = mkEnableOption "watson's fish integration" // {
+      default = true;
+    };
 
     settings = mkOption {
       type = iniFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/watson/config` on Linux or
         {file}`$HOME/Library/Application Support/watson/config` on Darwin.
diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 3303ed7f5..efc34a307 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -15,7 +15,7 @@ let
       type = types.nullOr types.int;
       default = null;
       example = 10;
-      description = lib.mdDoc "Margin value without unit.";
+      description = "Margin value without unit.";
     };
 
   waybarBarConfig = with types;
@@ -26,7 +26,7 @@ let
         layer = mkOption {
           type = nullOr (enum [ "top" "bottom" ]);
           default = null;
-          description = lib.mdDoc ''
+          description = ''
             Decide if the bar is displayed in front (`"top"`)
             of the windows or behind (`"bottom"`).
           '';
@@ -39,7 +39,7 @@ let
           example = literalExpression ''
             [ "DP-1" "!DP-2" "!DP-3" ]
           '';
-          description = lib.mdDoc ''
+          description = ''
             Specifies on which screen this bar will be displayed.
             Exclamation mark(!) can be used to exclude specific output.
           '';
@@ -49,14 +49,14 @@ let
           type = nullOr (enum [ "top" "bottom" "left" "right" ]);
           default = null;
           example = "right";
-          description = lib.mdDoc "Bar position relative to the output.";
+          description = "Bar position relative to the output.";
         };
 
         height = mkOption {
           type = nullOr ints.unsigned;
           default = null;
           example = 5;
-          description = lib.mdDoc
+          description =
             "Height to be used by the bar if possible. Leave blank for a dynamic value.";
         };
 
@@ -64,14 +64,14 @@ let
           type = nullOr ints.unsigned;
           default = null;
           example = 5;
-          description = lib.mdDoc
+          description =
             "Width to be used by the bar if possible. Leave blank for a dynamic value.";
         };
 
         modules-left = mkOption {
           type = listOf str;
           default = [ ];
-          description = lib.mdDoc "Modules that will be displayed on the left.";
+          description = "Modules that will be displayed on the left.";
           example = literalExpression ''
             [ "sway/workspaces" "sway/mode" "wlr/taskbar" ]
           '';
@@ -80,8 +80,7 @@ let
         modules-center = mkOption {
           type = listOf str;
           default = [ ];
-          description =
-            lib.mdDoc "Modules that will be displayed in the center.";
+          description = "Modules that will be displayed in the center.";
           example = literalExpression ''
             [ "sway/window" ]
           '';
@@ -90,8 +89,7 @@ let
         modules-right = mkOption {
           type = listOf str;
           default = [ ];
-          description =
-            lib.mdDoc "Modules that will be displayed on the right.";
+          description = "Modules that will be displayed on the right.";
           example = literalExpression ''
             [ "mpd" "custom/mymodule#with-css-id" "temperature" ]
           '';
@@ -101,7 +99,7 @@ let
           type = jsonFormat.type;
           visible = false;
           default = null;
-          description = lib.mdDoc "Modules configuration.";
+          description = "Modules configuration.";
           example = literalExpression ''
             {
               "sway/window" = {
@@ -117,8 +115,7 @@ let
         margin = mkOption {
           type = nullOr str;
           default = null;
-          description =
-            lib.mdDoc "Margins value using the CSS format without units.";
+          description = "Margins value using the CSS format without units.";
           example = "20 5";
         };
 
@@ -130,7 +127,7 @@ let
         name = mkOption {
           type = nullOr str;
           default = null;
-          description = lib.mdDoc
+          description =
             "Optional name added as a CSS class, for styling multiple waybars.";
           example = "waybar-1";
         };
@@ -139,7 +136,7 @@ let
           type = nullOr bool;
           default = null;
           example = false;
-          description = lib.mdDoc
+          description =
             "Option to disable the use of gtk-layer-shell for popups.";
         };
       };
@@ -148,13 +145,13 @@ in {
   meta.maintainers = with lib.maintainers; [ berbiche ];
 
   options.programs.waybar = with lib.types; {
-    enable = mkEnableOption (lib.mdDoc "Waybar");
+    enable = mkEnableOption "Waybar";
 
     package = mkOption {
       type = package;
       default = pkgs.waybar;
       defaultText = literalExpression "pkgs.waybar";
-      description = lib.mdDoc ''
+      description = ''
         Waybar package to use. Set to `null` to use the default package.
       '';
     };
@@ -162,7 +159,7 @@ in {
     settings = mkOption {
       type = either (listOf waybarBarConfig) (attrsOf waybarBarConfig);
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         Configuration for Waybar, see <https://github.com/Alexays/Waybar/wiki/Configuration>
         for supported values.
       '';
@@ -197,13 +194,13 @@ in {
       '';
     };
 
-    systemd.enable = mkEnableOption (lib.mdDoc "Waybar systemd integration");
+    systemd.enable = mkEnableOption "Waybar systemd integration";
 
     systemd.target = mkOption {
       type = str;
       default = "graphical-session.target";
       example = "sway-session.target";
-      description = lib.mdDoc ''
+      description = ''
         The systemd target that will automatically start the Waybar service.
 
         When setting this value to `"sway-session.target"`,
@@ -215,7 +212,7 @@ in {
     style = mkOption {
       type = nullOr (either path lines);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         CSS style of the bar.
 
         See <https://github.com/Alexays/Waybar/wiki/Configuration>
diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix
index 93861cd0b..b66028d6d 100644
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@@ -15,13 +15,13 @@ in {
   meta.maintainers = [ hm.maintainers.blmhemu ];
 
   options.programs.wezterm = {
-    enable = mkEnableOption (lib.mdDoc "wezterm");
+    enable = mkEnableOption "wezterm";
 
     package = mkOption {
       type = types.package;
       default = pkgs.wezterm;
       defaultText = literalExpression "pkgs.wezterm";
-      description = lib.mdDoc "The Wezterm package to install.";
+      description = "The Wezterm package to install.";
     };
 
     extraConfig = mkOption {
@@ -44,7 +44,7 @@ in {
           }
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration written to
         {file}`$XDG_CONFIG_HOME/wezterm/wezterm.lua`. See
         <https://wezfurlong.org/wezterm/config/files.html>
@@ -74,7 +74,7 @@ in {
           selection_fg = "#E9E9E9";
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of additional color schemes to be written to
         {file}`$XDG_CONFIG_HOME/wezterm/colors`, where each key is
         taken as the name of the corresponding color scheme. See
@@ -83,15 +83,13 @@ in {
       '';
     };
 
-    enableBashIntegration =
-      mkEnableOption (lib.mdDoc "WezTerm's Bash integration") // {
-        default = true;
-      };
+    enableBashIntegration = mkEnableOption "WezTerm's Bash integration" // {
+      default = true;
+    };
 
-    enableZshIntegration =
-      mkEnableOption (lib.mdDoc "WezTerm's Zsh integration") // {
-        default = true;
-      };
+    enableZshIntegration = mkEnableOption "WezTerm's Zsh integration" // {
+      default = true;
+    };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/wlogout.nix b/modules/programs/wlogout.nix
index 28b443f52..b01f8a0ae 100644
--- a/modules/programs/wlogout.nix
+++ b/modules/programs/wlogout.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) all filterAttrs isStorePath literalExpression types;
-  inherit (lib.options) mkEnableOption mkPackageOptionMD mkOption;
+  inherit (lib.options) mkEnableOption mkPackageOption mkOption;
   inherit (lib.modules) mkIf;
   inherit (lib.strings) concatMapStrings;
   inherit (builtins) toJSON;
@@ -20,49 +20,49 @@ let
           type = str;
           default = "";
           example = "shutdown";
-          description = lib.mdDoc "CSS label of button.";
+          description = "CSS label of button.";
         };
 
         action = mkOption {
           type = either path str;
           default = "";
           example = "systemctl poweroff";
-          description = lib.mdDoc "Command to execute when clicked.";
+          description = "Command to execute when clicked.";
         };
 
         text = mkOption {
           type = str;
           default = "";
           example = "Shutdown";
-          description = lib.mdDoc "Text displayed on button.";
+          description = "Text displayed on button.";
         };
 
         keybind = mkOption {
           type = str;
           default = "";
           example = "s";
-          description = lib.mdDoc "Keyboard character to trigger this action.";
+          description = "Keyboard character to trigger this action.";
         };
 
         height = mkOption {
           type = nullOr (numbers.between 0 1);
           default = null;
           example = 0.5;
-          description = lib.mdDoc "Relative height of tile.";
+          description = "Relative height of tile.";
         };
 
         width = mkOption {
           type = nullOr (numbers.between 0 1);
           default = null;
           example = 0.5;
-          description = lib.mdDoc "Relative width of tile.";
+          description = "Relative width of tile.";
         };
 
         circular = mkOption {
           type = nullOr bool;
           default = null;
           example = true;
-          description = lib.mdDoc "Make button circular.";
+          description = "Make button circular.";
         };
       };
     };
@@ -70,14 +70,14 @@ in {
   meta.maintainers = [ lib.maintainers.Scrumplex ];
 
   options.programs.wlogout = with lib.types; {
-    enable = mkEnableOption (lib.mdDoc "wlogout");
+    enable = mkEnableOption "wlogout";
 
-    package = mkPackageOptionMD pkgs "wlogout" { };
+    package = mkPackageOption pkgs "wlogout" { };
 
     layout = mkOption {
       type = listOf wlogoutLayoutConfig;
       default = [ ];
-      description = lib.mdDoc ''
+      description = ''
         Layout configuration for wlogout, see <https://github.com/ArtsyMacaw/wlogout#config>
         for supported values.
       '';
@@ -96,7 +96,7 @@ in {
     style = mkOption {
       type = nullOr (either path str);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         CSS style of the bar.
 
         See <https://github.com/ArtsyMacaw/wlogout#style>
diff --git a/modules/programs/wofi.nix b/modules/programs/wofi.nix
index e4969e407..1317716ed 100644
--- a/modules/programs/wofi.nix
+++ b/modules/programs/wofi.nix
@@ -14,15 +14,15 @@ in {
   meta.maintainers = [ maintainers.christoph-heiss ];
 
   options.programs.wofi = {
-    enable = mkEnableOption (lib.mdDoc
-      "wofi: a launcher/menu program for wlroots based wayland compositors such as sway");
+    enable = mkEnableOption
+      "wofi: a launcher/menu program for wlroots based wayland compositors such as sway";
 
-    package = mkPackageOptionMD pkgs "wofi" { };
+    package = mkPackageOption pkgs "wofi" { };
 
     settings = mkOption {
       default = { };
       type = types.attrs;
-      description = lib.mdDoc ''
+      description = ''
         Configuration options for wofi. See
         {manpage}`wofi(5)`.
       '';
@@ -38,7 +38,7 @@ in {
     style = mkOption {
       default = null;
       type = types.nullOr types.str;
-      description = lib.mdDoc ''
+      description = ''
         CSS style for wofi to use as a stylesheet. See
         {manpage}`wofi(7)`.
       '';
diff --git a/modules/programs/xmobar.nix b/modules/programs/xmobar.nix
index 6c712c673..267b30801 100644
--- a/modules/programs/xmobar.nix
+++ b/modules/programs/xmobar.nix
@@ -5,13 +5,13 @@ with lib;
 let cfg = config.programs.xmobar;
 in {
   options.programs.xmobar = {
-    enable = mkEnableOption (lib.mdDoc "Xmobar, a minimalistic status bar");
+    enable = mkEnableOption "Xmobar, a minimalistic status bar";
 
     package = mkOption {
       default = pkgs.haskellPackages.xmobar;
       defaultText = literalExpression "pkgs.haskellPackages.xmobar";
       type = types.package;
-      description = lib.mdDoc ''
+      description = ''
         Package providing the {command}`xmobar` binary.
       '';
     };
@@ -40,7 +40,7 @@ in {
           }
       '';
       type = types.lines;
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration lines to add to
         {file}`$XDG_CONFIG_HOME/xmobar/.xmobarrc`.
         See
diff --git a/modules/programs/yt-dlp.nix b/modules/programs/yt-dlp.nix
index f54dd88d9..3b8e9c709 100644
--- a/modules/programs/yt-dlp.nix
+++ b/modules/programs/yt-dlp.nix
@@ -16,13 +16,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.yt-dlp = {
-    enable = mkEnableOption (lib.mdDoc "yt-dlp");
+    enable = mkEnableOption "yt-dlp";
 
     package = mkOption {
       type = types.package;
       default = pkgs.yt-dlp;
       defaultText = literalExpression "pkgs.yt-dlp";
-      description = lib.mdDoc "Package providing the {command}`yt-dlp` tool.";
+      description = "Package providing the {command}`yt-dlp` tool.";
     };
 
     settings = mkOption {
@@ -37,7 +37,7 @@ in {
           downloader-args = "aria2c:'-c -x8 -s8 -k1M'";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/yt-dlp/config`.
 
@@ -56,7 +56,7 @@ in {
         --update
         -F
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration to add to
         {file}`$XDG_CONFIG_HOME/yt-dlp/config`.
       '';
diff --git a/modules/programs/z-lua.nix b/modules/programs/z-lua.nix
index 1105f2f6d..37a8479ee 100644
--- a/modules/programs/z-lua.nix
+++ b/modules/programs/z-lua.nix
@@ -18,13 +18,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.z-lua = {
-    enable = mkEnableOption (lib.mdDoc "z.lua");
+    enable = mkEnableOption "z.lua";
 
     options = mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [ "enhanced" "once" "fzf" ];
-      description = lib.mdDoc ''
+      description = ''
         List of options to pass to z.lua.
       '';
     };
@@ -32,7 +32,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -40,7 +40,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -48,7 +48,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
@@ -56,7 +56,7 @@ in {
     enableAliases = mkOption {
       default = false;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable recommended z.lua aliases.
       '';
     };
diff --git a/modules/programs/zathura.nix b/modules/programs/zathura.nix
index 9b916caf6..ba34af590 100644
--- a/modules/programs/zathura.nix
+++ b/modules/programs/zathura.nix
@@ -18,21 +18,21 @@ in {
   meta.maintainers = [ maintainers.rprospero ];
 
   options.programs.zathura = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       Zathura, a highly customizable and functional document viewer
-      focused on keyboard interaction'');
+      focused on keyboard interaction'';
 
     package = mkOption {
       type = types.package;
       default = pkgs.zathura;
       defaultText = "pkgs.zathura";
-      description = lib.mdDoc "The Zathura package to use";
+      description = "The Zathura package to use";
     };
 
     options = mkOption {
       default = { };
       type = with types; attrsOf (either str (either bool int));
-      description = lib.mdDoc ''
+      description = ''
         Add {option}`:set` command options to zathura and make
         them permanent. See
         {manpage}`zathurarc(5)`
@@ -47,7 +47,7 @@ in {
     mappings = mkOption {
       default = { };
       type = with types; attrsOf str;
-      description = lib.mdDoc ''
+      description = ''
         Add {option}`:map` mappings to zathura and make
         them permanent. See
         {manpage}`zathurarc(5)`
@@ -66,7 +66,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Additional commands for zathura that will be added to the
         {file}`zathurarc` file.
       '';
diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix
index e956db825..44a3d69f4 100644
--- a/modules/programs/zellij.nix
+++ b/modules/programs/zellij.nix
@@ -11,13 +11,13 @@ in {
   meta.maintainers = [ hm.maintainers.mainrs ];
 
   options.programs.zellij = {
-    enable = mkEnableOption (lib.mdDoc "zellij");
+    enable = mkEnableOption "zellij";
 
     package = mkOption {
       type = types.package;
       default = pkgs.zellij;
       defaultText = literalExpression "pkgs.zellij";
-      description = lib.mdDoc ''
+      description = ''
         The zellij package to install.
       '';
     };
@@ -31,7 +31,7 @@ in {
           themes.custom.fg = "#ffffff";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/zellij/config.yaml`.
 
@@ -40,15 +40,15 @@ in {
       '';
     };
 
-    enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+    enableBashIntegration = mkEnableOption "Bash integration" // {
       default = false;
     };
 
-    enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+    enableZshIntegration = mkEnableOption "Zsh integration" // {
       default = false;
     };
 
-    enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // {
+    enableFishIntegration = mkEnableOption "Fish integration" // {
       default = false;
     };
   };
diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index 3035fca86..11ae353cc 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -12,13 +12,13 @@ in {
   meta.maintainers = [ ];
 
   options.programs.zoxide = {
-    enable = mkEnableOption (lib.mdDoc "zoxide");
+    enable = mkEnableOption "zoxide";
 
     package = mkOption {
       type = types.package;
       default = pkgs.zoxide;
       defaultText = literalExpression "pkgs.zoxide";
-      description = lib.mdDoc ''
+      description = ''
         Zoxide package to install.
       '';
     };
@@ -27,7 +27,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--no-aliases" ];
-      description = lib.mdDoc ''
+      description = ''
         List of options to pass to zoxide.
       '';
     };
@@ -35,7 +35,7 @@ in {
     enableBashIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Bash integration.
       '';
     };
@@ -43,7 +43,7 @@ in {
     enableZshIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Zsh integration.
       '';
     };
@@ -51,7 +51,7 @@ in {
     enableFishIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Fish integration.
       '';
     };
@@ -59,7 +59,7 @@ in {
     enableNushellIntegration = mkOption {
       default = true;
       type = types.bool;
-      description = lib.mdDoc ''
+      description = ''
         Whether to enable Nushell integration.
       '';
     };
diff --git a/modules/programs/zplug.nix b/modules/programs/zplug.nix
index 2fb7b0cec..94e3173a4 100644
--- a/modules/programs/zplug.nix
+++ b/modules/programs/zplug.nix
@@ -10,13 +10,13 @@ let
     options = {
       name = mkOption {
         type = types.str;
-        description = lib.mdDoc "The name of the plugin.";
+        description = "The name of the plugin.";
       };
 
       tags = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc "The plugin tags.";
+        description = "The plugin tags.";
       };
     };
 
@@ -24,12 +24,12 @@ let
 
 in {
   options.programs.zsh.zplug = {
-    enable = mkEnableOption (lib.mdDoc "zplug - a zsh plugin manager");
+    enable = mkEnableOption "zplug - a zsh plugin manager";
 
     plugins = mkOption {
       default = [ ];
       type = types.listOf pluginModule;
-      description = lib.mdDoc "List of zplug plugins.";
+      description = "List of zplug plugins.";
     };
 
     zplugHome = mkOption {
@@ -37,7 +37,7 @@ in {
       default = "${config.home.homeDirectory}/.zplug";
       defaultText = "~/.zplug";
       apply = toString;
-      description = lib.mdDoc "Path to zplug home directory.";
+      description = "Path to zplug home directory.";
     };
   };
 
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 6281d1664..94f2a3929 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -37,14 +37,14 @@ let
       size = mkOption {
         type = types.int;
         default = 10000;
-        description = lib.mdDoc "Number of history lines to keep.";
+        description = "Number of history lines to keep.";
       };
 
       save = mkOption {
         type = types.int;
         defaultText = 10000;
         default = config.size;
-        description = lib.mdDoc "Number of history lines to save.";
+        description = "Number of history lines to save.";
       };
 
       path = mkOption {
@@ -57,14 +57,14 @@ let
           "$ZDOTDIR/.zsh_history" otherwise
         '';
         example = literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"'';
-        description = lib.mdDoc "History file location";
+        description = "History file location";
       };
 
       ignorePatterns = mkOption {
         type = types.listOf types.str;
         default = [];
         example = literalExpression ''[ "rm *" "pkill *" ]'';
-        description = lib.mdDoc ''
+        description = ''
           Do not enter command lines into the history list
           if they match any one of the given shell patterns.
         '';
@@ -73,7 +73,7 @@ let
       ignoreDups = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Do not enter command lines into the history list
           if they are duplicates of the previous event.
         '';
@@ -82,7 +82,7 @@ let
       ignoreSpace = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Do not enter command lines into the history list
           if the first character is a space.
         '';
@@ -91,19 +91,19 @@ let
       expireDuplicatesFirst = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Expire duplicates first.";
+        description = "Expire duplicates first.";
       };
 
       extended = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc "Save timestamp into the history file.";
+        description = "Save timestamp into the history file.";
       };
 
       share = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Share command history between zsh sessions.";
+        description = "Share command history between zsh sessions.";
       };
     };
   });
@@ -112,7 +112,7 @@ let
     options = {
       src = mkOption {
         type = types.path;
-        description = lib.mdDoc ''
+        description = ''
           Path to the plugin folder.
 
           Will be added to {env}`fpath` and {env}`PATH`.
@@ -121,7 +121,7 @@ let
 
       name = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           The name of the plugin.
 
           Don't forget to add {option}`file`
@@ -131,7 +131,7 @@ let
 
       file = mkOption {
         type = types.str;
-        description = lib.mdDoc "The plugin script to source.";
+        description = "The plugin script to source.";
       };
     };
 
@@ -140,15 +140,15 @@ let
 
   ohMyZshModule = types.submodule {
     options = {
-      enable = mkEnableOption (lib.mdDoc "oh-my-zsh");
+      enable = mkEnableOption "oh-my-zsh";
 
-      package = mkPackageOptionMD pkgs "oh-my-zsh" { };
+      package = mkPackageOption pkgs "oh-my-zsh" { };
 
       plugins = mkOption {
         default = [];
         example = [ "git" "sudo" ];
         type = types.listOf types.str;
-        description = lib.mdDoc ''
+        description = ''
           List of oh-my-zsh plugins
         '';
       };
@@ -157,7 +157,7 @@ let
         default = "";
         type = types.str;
         example = "$HOME/my_customizations";
-        description = lib.mdDoc ''
+        description = ''
           Path to a custom oh-my-zsh package to override config of
           oh-my-zsh. See <https://github.com/robbyrussell/oh-my-zsh/wiki/Customization>
           for more information.
@@ -168,7 +168,7 @@ let
         default = "";
         example = "robbyrussell";
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           Name of the theme to be used by oh-my-zsh.
         '';
       };
@@ -179,7 +179,7 @@ let
           zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
         '';
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           Extra settings for plugins.
         '';
       };
@@ -188,11 +188,11 @@ let
 
   historySubstringSearchModule = types.submodule {
     options = {
-      enable = mkEnableOption (lib.mdDoc "history substring search");
+      enable = mkEnableOption "history substring search";
       searchUpKey = mkOption {
         type = with types; either (listOf str) str ;
         default = [ "^[[A" ];
-        description = lib.mdDoc ''
+        description = ''
           The key codes to be used when searching up.
           The default of `^[[A` corresponds to the UP key.
         '';
@@ -200,7 +200,7 @@ let
       searchDownKey = mkOption {
         type = with types; either (listOf str) str ;
         default = [ "^[[B" ];
-        description = lib.mdDoc ''
+        description = ''
           The key codes to be used when searching down.
           The default of `^[[B` corresponds to the DOWN key.
         '';
@@ -210,14 +210,14 @@ let
 
   syntaxHighlightingModule = types.submodule {
     options = {
-      enable = mkEnableOption (lib.mdDoc "zsh syntax highlighting");
+      enable = mkEnableOption "zsh syntax highlighting";
 
-      package = mkPackageOptionMD pkgs "zsh-syntax-highlighting" { };
+      package = mkPackageOption pkgs "zsh-syntax-highlighting" { };
 
       styles = mkOption {
         type = types.attrsOf types.str;
         default = {};
-        description = lib.mdDoc ''
+        description = ''
           Custom styles for syntax highlighting.
           See each highlighter's options: <https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md>
         '';
@@ -234,13 +234,13 @@ in
 
   options = {
     programs.zsh = {
-      enable = mkEnableOption (lib.mdDoc "Z shell (Zsh)");
+      enable = mkEnableOption "Z shell (Zsh)";
 
-      package = mkPackageOptionMD pkgs "zsh" { };
+      package = mkPackageOption pkgs "zsh" { };
 
       autocd = mkOption {
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Automatically enter into a directory if typed directly into shell.
         '';
         type = types.nullOr types.bool;
@@ -248,7 +248,7 @@ in
 
       cdpath = mkOption {
         default = [];
-        description = lib.mdDoc ''
+        description = ''
           List of paths to autocomplete calls to {command}`cd`.
         '';
         type = types.listOf types.str;
@@ -257,7 +257,7 @@ in
       dotDir = mkOption {
         default = null;
         example = ".config/zsh";
-        description = lib.mdDoc ''
+        description = ''
           Directory where the zsh configuration and more should be located,
           relative to the users home directory. The default is the home
           directory.
@@ -273,7 +273,7 @@ in
             ".." = "cd ..";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that maps aliases (the top level attribute names in
           this option) to command strings or directly to build outputs.
         '';
@@ -288,7 +288,7 @@ in
             G = "| grep";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Similar to [](#opt-programs.zsh.shellAliases),
           but are substituted anywhere on a line.
         '';
@@ -304,7 +304,7 @@ in
             dl    = "$HOME/Downloads";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that adds to named directory hash table.
         '';
         type = types.attrsOf types.str;
@@ -312,7 +312,7 @@ in
 
       enableCompletion = mkOption {
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Enable zsh completion. Don't forget to add
           ```nix
             environment.pathsToLink = [ "/share/zsh" ];
@@ -324,87 +324,87 @@ in
 
       completionInit = mkOption {
         default = "autoload -U compinit && compinit";
-        description = lib.mdDoc "Initialization commands to run when completion is enabled.";
+        description = "Initialization commands to run when completion is enabled.";
         type = types.lines;
       };
 
       enableAutosuggestions = mkOption {
         default = false;
-        description = lib.mdDoc "Enable zsh autosuggestions";
+        description = "Enable zsh autosuggestions";
       };
 
       syntaxHighlighting = mkOption {
         type = syntaxHighlightingModule;
         default = {};
-        description = lib.mdDoc "Options related to zsh-syntax-highlighting.";
+        description = "Options related to zsh-syntax-highlighting.";
       };
 
       historySubstringSearch = mkOption {
         type = historySubstringSearchModule;
         default = {};
-        description = lib.mdDoc "Options related to zsh-history-substring-search.";
+        description = "Options related to zsh-history-substring-search.";
       };
 
       history = mkOption {
         type = historyModule;
         default = {};
-        description = lib.mdDoc "Options related to commands history configuration.";
+        description = "Options related to commands history configuration.";
       };
 
       defaultKeymap = mkOption {
         type = types.nullOr (types.enum (attrNames bindkeyCommands));
         default = null;
         example = "emacs";
-        description = lib.mdDoc "The default base keymap to use.";
+        description = "The default base keymap to use.";
       };
 
       sessionVariables = mkOption {
         default = {};
         type = types.attrs;
         example = { MAILCHECK = 30; };
-        description = lib.mdDoc "Environment variables that will be set for zsh session.";
+        description = "Environment variables that will be set for zsh session.";
       };
 
       initExtraBeforeCompInit = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Extra commands that should be added to {file}`.zshrc` before compinit.";
+        description = "Extra commands that should be added to {file}`.zshrc` before compinit.";
       };
 
       initExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Extra commands that should be added to {file}`.zshrc`.";
+        description = "Extra commands that should be added to {file}`.zshrc`.";
       };
 
       initExtraFirst = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Commands that should be added to top of {file}`.zshrc`.";
+        description = "Commands that should be added to top of {file}`.zshrc`.";
       };
 
       envExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Extra commands that should be added to {file}`.zshenv`.";
+        description = "Extra commands that should be added to {file}`.zshenv`.";
       };
 
       profileExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Extra commands that should be added to {file}`.zprofile`.";
+        description = "Extra commands that should be added to {file}`.zprofile`.";
       };
 
       loginExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Extra commands that should be added to {file}`.zlogin`.";
+        description = "Extra commands that should be added to {file}`.zlogin`.";
       };
 
       logoutExtra = mkOption {
         default = "";
         type = types.lines;
-        description = lib.mdDoc "Extra commands that should be added to {file}`.zlogout`.";
+        description = "Extra commands that should be added to {file}`.zlogout`.";
       };
 
       plugins = mkOption {
@@ -434,20 +434,20 @@ in
             }
           ]
         '';
-        description = lib.mdDoc "Plugins to source in {file}`.zshrc`.";
+        description = "Plugins to source in {file}`.zshrc`.";
       };
 
       oh-my-zsh = mkOption {
         type = ohMyZshModule;
         default = {};
-        description = lib.mdDoc "Options to configure oh-my-zsh.";
+        description = "Options to configure oh-my-zsh.";
       };
 
       localVariables = mkOption {
         type = types.attrs;
         default = {};
         example = { POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=["dir" "vcs"]; };
-        description = lib.mdDoc ''
+        description = ''
           Extra local variables defined at the top of {file}`.zshrc`.
         '';
       };
diff --git a/modules/programs/zsh/prezto.nix b/modules/programs/zsh/prezto.nix
index fd33f0d6f..ddf862f98 100644
--- a/modules/programs/zsh/prezto.nix
+++ b/modules/programs/zsh/prezto.nix
@@ -12,21 +12,21 @@ let
 
   preztoModule = types.submodule {
     options = {
-      enable = mkEnableOption (lib.mdDoc "prezto");
+      enable = mkEnableOption "prezto";
 
       caseSensitive = mkOption {
         type = types.nullOr types.bool;
         default = null;
         example = true;
         description =
-          lib.mdDoc "Set case-sensitivity for completion, history lookup, etc.";
+          "Set case-sensitivity for completion, history lookup, etc.";
       };
 
       color = mkOption {
         type = types.nullOr types.bool;
         default = true;
         example = false;
-        description = lib.mdDoc ''
+        description = ''
           Color output (automatically set to `false` on dumb terminals).
         '';
       };
@@ -35,14 +35,13 @@ let
         type = types.listOf types.path;
         default = [ ];
         example = [ "$HOME/.zprezto-contrib" ];
-        description =
-          lib.mdDoc "Add additional directories to load prezto modules from.";
+        description = "Add additional directories to load prezto modules from.";
       };
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Additional configuration to add to {file}`.zpreztorc`.
         '';
       };
@@ -51,7 +50,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = [ "attr" "stat" ];
-        description = lib.mdDoc ''
+        description = ''
           Set the Zsh modules to load ({manpage}`zshmodules(1)`).
         '';
       };
@@ -60,7 +59,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = [ "zargs" "zmv" ];
-        description = lib.mdDoc ''
+        description = ''
           Set the Zsh functions to load ({manpage}`zshcontrib(1)`).
         '';
       };
@@ -78,7 +77,7 @@ let
           "completion"
           "prompt"
         ];
-        description = lib.mdDoc
+        description =
           "Set the Prezto modules to load (browse modules). The order matters.";
       };
 
@@ -86,14 +85,14 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "fg=blue";
-        description = lib.mdDoc "Set the query found color.";
+        description = "Set the query found color.";
       };
 
       completions.ignoredHosts = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "0.0.0.0" "127.0.0.1" ];
-        description = lib.mdDoc ''
+        description = ''
           Set the entries to ignore in static {file}`/etc/hosts` for
           host completion.
         '';
@@ -104,7 +103,7 @@ let
           type = types.nullOr (types.enum [ "emacs" "vi" ]);
           default = "emacs";
           example = "vi";
-          description = lib.mdDoc ''
+          description = ''
             Set the key mapping style to `emacs` or `vi`.
           '';
         };
@@ -113,7 +112,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc ''
+          description = ''
             Automatically convert `....` to `../..`
           '';
         };
@@ -122,7 +121,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc "Allow the Zsh prompt context to be shown.";
+          description = "Allow the Zsh prompt context to be shown.";
         };
       };
 
@@ -130,7 +129,7 @@ let
         type = types.nullOr (types.enum [ "dirty" "untracked" "all" "none" ]);
         default = null;
         example = "all";
-        description = lib.mdDoc ''
+        description = ''
           Ignore submodules when they are `dirty`, `untracked`, `all`,
           or `none`.
         '';
@@ -140,7 +139,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "g";
-        description = lib.mdDoc "Set the command prefix on non-GNU systems.";
+        description = "Set the command prefix on non-GNU systems.";
       };
 
       historySubstring = {
@@ -148,20 +147,20 @@ let
           type = types.nullOr types.str;
           default = null;
           example = "fg=blue";
-          description = lib.mdDoc "Set the query found color.";
+          description = "Set the query found color.";
         };
 
         notFoundColor = mkOption {
           type = types.nullOr types.str;
           default = null;
           example = "fg=red";
-          description = lib.mdDoc "Set the query not found color.";
+          description = "Set the query not found color.";
         };
 
         globbingFlags = mkOption {
           type = types.nullOr types.str;
           default = null;
-          description = lib.mdDoc "Set the search globbing flags.";
+          description = "Set the search globbing flags.";
         };
       };
 
@@ -169,7 +168,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "manpages";
-        description = lib.mdDoc ''
+        description = ''
           Set the keyword used by {command}`mand` to open man pages
           in Dash.app.
         '';
@@ -180,7 +179,7 @@ let
           type = types.nullOr types.str;
           default = "sorin";
           example = "pure";
-          description = lib.mdDoc ''
+          description = ''
             Set the prompt theme to load. Setting it to `random`
             loads a random theme. Automatically set to `off` on dumb
             terminals.
@@ -191,7 +190,7 @@ let
           type = types.nullOr (types.enum [ "short" "long" "full" ]);
           default = null;
           example = "short";
-          description = lib.mdDoc ''
+          description = ''
             Set the working directory prompt display length. By
             default, it is set to `short`. Set it to `long` (without `~`
             expansion) for longer or `full` (with `~` expansion) for
@@ -203,7 +202,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc ''
+          description = ''
             Set the prompt to display the return code along with an
             indicator for non-zero return codes. This is not supported by all prompts.
           '';
@@ -215,15 +214,14 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description =
-            lib.mdDoc "Auto switch to Python virtualenv on directory change.";
+          description = "Auto switch to Python virtualenv on directory change.";
         };
 
         virtualenvInitialize = mkOption {
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc
+          description =
             "Automatically initialize virtualenvwrapper if pre-requisites are met.";
         };
       };
@@ -232,8 +230,7 @@ let
         type = types.nullOr types.bool;
         default = null;
         example = true;
-        description =
-          lib.mdDoc "Auto switch the Ruby version on directory change.";
+        description = "Auto switch the Ruby version on directory change.";
       };
 
       screen = {
@@ -241,7 +238,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc
+          description =
             "Auto start a session when Zsh is launched in a local terminal.";
         };
 
@@ -249,7 +246,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc
+          description =
             "Auto start a session when Zsh is launched in a SSH connection.";
         };
       };
@@ -258,8 +255,7 @@ let
         type = types.listOf types.str;
         default = [ ];
         example = [ "id_rsa" "id_rsa2" "id_github" ];
-        description =
-          lib.mdDoc "Set the SSH identities to load into the agent.";
+        description = "Set the SSH identities to load into the agent.";
       };
 
       syntaxHighlighting = {
@@ -267,7 +263,7 @@ let
           type = types.listOf types.str;
           default = [ ];
           example = [ "main" "brackets" "pattern" "line" "cursor" "root" ];
-          description = lib.mdDoc ''
+          description = ''
             Set syntax highlighters. By default, only the main
             highlighter is enabled.
           '';
@@ -281,14 +277,14 @@ let
             command = "bg=blue";
             function = "bg=blue";
           };
-          description = lib.mdDoc "Set syntax highlighting styles.";
+          description = "Set syntax highlighting styles.";
         };
 
         pattern = mkOption {
           type = types.attrsOf types.str;
           default = { };
           example = { "rm*-rf*" = "fg=white,bold,bg=red"; };
-          description = lib.mdDoc "Set syntax pattern styles.";
+          description = "Set syntax pattern styles.";
         };
       };
 
@@ -297,28 +293,28 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc "Auto set the tab and window titles.";
+          description = "Auto set the tab and window titles.";
         };
 
         windowTitleFormat = mkOption {
           type = types.nullOr types.str;
           default = null;
           example = "%n@%m: %s";
-          description = lib.mdDoc "Set the window title format.";
+          description = "Set the window title format.";
         };
 
         tabTitleFormat = mkOption {
           type = types.nullOr types.str;
           default = null;
           example = "%m: %s";
-          description = lib.mdDoc "Set the tab title format.";
+          description = "Set the tab title format.";
         };
 
         multiplexerTitleFormat = mkOption {
           type = types.nullOr types.str;
           default = null;
           example = "%s";
-          description = lib.mdDoc "Set the multiplexer title format.";
+          description = "Set the multiplexer title format.";
         };
       };
 
@@ -327,7 +323,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc
+          description =
             "Auto start a session when Zsh is launched in a local terminal.";
         };
 
@@ -335,7 +331,7 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc
+          description =
             "Auto start a session when Zsh is launched in a SSH connection.";
         };
 
@@ -343,14 +339,14 @@ let
           type = types.nullOr types.bool;
           default = null;
           example = true;
-          description = lib.mdDoc "Integrate with iTerm2.";
+          description = "Integrate with iTerm2.";
         };
 
         defaultSessionName = mkOption {
           type = types.nullOr types.str;
           default = null;
           example = "YOUR DEFAULT SESSION NAME";
-          description = lib.mdDoc "Set the default session name.";
+          description = "Set the default session name.";
         };
       };
 
@@ -358,7 +354,7 @@ let
         type = types.nullOr types.bool;
         default = null;
         example = true;
-        description = lib.mdDoc ''
+        description = ''
           Enabled safe options. This aliases {command}`cp`,
           {command}`ln`, {command}`mv` and {command}`rm` so that they
           prompt before deleting or overwriting files. Set to `no` to
@@ -375,7 +371,7 @@ in {
       prezto = mkOption {
         type = preztoModule;
         default = { };
-        description = lib.mdDoc "Options to configure prezto.";
+        description = "Options to configure prezto.";
       };
     };
   };
diff --git a/modules/services/autorandr.nix b/modules/services/autorandr.nix
index 1f0fa8cab..64e6008e8 100644
--- a/modules/services/autorandr.nix
+++ b/modules/services/autorandr.nix
@@ -10,8 +10,8 @@ in {
 
   options = {
     services.autorandr = {
-      enable = mkEnableOption (lib.mdDoc "") // {
-        description = lib.mdDoc ''
+      enable = mkEnableOption "" // {
+        description = ''
           Whether to enable the Autorandr systemd service.
           This module is complementary to {option}`programs.autorandr`
           which handles the configuration (profiles).
@@ -22,7 +22,7 @@ in {
         default = false;
         type = types.bool;
         description =
-          lib.mdDoc "Treat outputs as connected even if their lids are closed.";
+          "Treat outputs as connected even if their lids are closed.";
       };
     };
   };
diff --git a/modules/services/avizo.nix b/modules/services/avizo.nix
index 87f4c312e..1bf1c1e68 100644
--- a/modules/services/avizo.nix
+++ b/modules/services/avizo.nix
@@ -9,7 +9,7 @@ in {
   meta.maintainers = [ hm.maintainers.pltanton ];
 
   options.services.avizo = {
-    enable = mkEnableOption (lib.mdDoc "avizo, a simple notification daemon");
+    enable = mkEnableOption "avizo, a simple notification daemon";
 
     settings = mkOption {
       type = (pkgs.formats.ini { }).type;
@@ -25,7 +25,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         The settings that will be written to the avizo configuration file.
       '';
     };
@@ -39,7 +39,7 @@ in {
           patchPhase = "cp ''${./images}/*.png data/images/";
         })
       '';
-      description = lib.mdDoc "The `avizo` package to use.";
+      description = "The `avizo` package to use.";
     };
   };
 
diff --git a/modules/services/barrier.nix b/modules/services/barrier.nix
index 16ab0b4c8..513a7e749 100644
--- a/modules/services/barrier.nix
+++ b/modules/services/barrier.nix
@@ -16,36 +16,36 @@ in {
 
     client = {
 
-      enable = mkEnableOption (lib.mdDoc "Barrier Client daemon");
+      enable = mkEnableOption "Barrier Client daemon";
 
       name = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Screen name of client. Defaults to hostname.
         '';
       };
 
       server = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           Server to connect to formatted as
           `<host>[:<port>]`.
           Port defaults to `24800`.
         '';
       };
 
-      enableCrypto = mkEnableOption (lib.mdDoc "crypto (SSL) plugin") // {
+      enableCrypto = mkEnableOption "crypto (SSL) plugin" // {
         default = true;
       };
 
-      enableDragDrop = mkEnableOption (lib.mdDoc "file drag &amp; drop");
+      enableDragDrop = mkEnableOption "file drag &amp; drop";
 
       extraFlags = mkOption {
         type = types.listOf types.str;
         default = [ "-f" ];
         defaultText = literalExpression ''[ "-f" ]'';
-        description = lib.mdDoc ''
+        description = ''
           Additional flags to pass to {command}`barrierc`.
           See {command}`barrierc --help`.
         '';
diff --git a/modules/services/batsignal.nix b/modules/services/batsignal.nix
index d0eb854bd..4f209f1e0 100644
--- a/modules/services/batsignal.nix
+++ b/modules/services/batsignal.nix
@@ -9,14 +9,14 @@ in {
 
   options = {
     services.batsignal = {
-      enable = lib.mkEnableOption (lib.mdDoc "Batsignal Battery Daemon");
+      enable = lib.mkEnableOption "Batsignal Battery Daemon";
 
-      package = lib.mkPackageOptionMD pkgs "batsignal" { };
+      package = lib.mkPackageOption pkgs "batsignal" { };
 
       extraArgs = lib.mkOption {
         type = with lib.types; listOf str;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           Extra arguments to be passed to the batsignal executable.
         '';
       };
diff --git a/modules/services/betterlockscreen.nix b/modules/services/betterlockscreen.nix
index c3be8f05d..c64ca08a2 100644
--- a/modules/services/betterlockscreen.nix
+++ b/modules/services/betterlockscreen.nix
@@ -9,28 +9,26 @@ in {
 
   options = {
     services.betterlockscreen = {
-      enable =
-        mkEnableOption (lib.mdDoc "betterlockscreen, a screen-locker module");
+      enable = mkEnableOption "betterlockscreen, a screen-locker module";
 
       package = mkOption {
         type = types.package;
         default = pkgs.betterlockscreen;
         defaultText = literalExpression "pkgs.betterlockscreen";
-        description =
-          lib.mdDoc "Package providing {command}`betterlockscreen`.";
+        description = "Package providing {command}`betterlockscreen`.";
       };
 
       arguments = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc
+        description =
           "List of arguments appended to `./betterlockscreen --lock [args]`";
       };
 
       inactiveInterval = mkOption {
         type = types.int;
         default = 10;
-        description = lib.mdDoc ''
+        description = ''
           Value used for {option}`services.screen-locker.inactiveInterval`.
         '';
       };
diff --git a/modules/services/blueman-applet.nix b/modules/services/blueman-applet.nix
index b410247d7..5211534c4 100644
--- a/modules/services/blueman-applet.nix
+++ b/modules/services/blueman-applet.nix
@@ -5,8 +5,8 @@ with lib;
 {
   options = {
     services.blueman-applet = {
-      enable = mkEnableOption (lib.mdDoc "") // {
-        description = lib.mdDoc ''
+      enable = mkEnableOption "" // {
+        description = ''
           Whether to enable the Blueman applet.
 
           Note that for the applet to work, the `blueman` service should
diff --git a/modules/services/borgmatic.nix b/modules/services/borgmatic.nix
index 7f7236953..1e1813946 100644
--- a/modules/services/borgmatic.nix
+++ b/modules/services/borgmatic.nix
@@ -10,12 +10,12 @@ in {
 
   options = {
     services.borgmatic = {
-      enable = mkEnableOption (lib.mdDoc "Borgmatic service");
+      enable = mkEnableOption "Borgmatic service";
 
       frequency = mkOption {
         type = types.str;
         default = "hourly";
-        description = lib.mdDoc ''
+        description = ''
           How often to run borgmatic when
           `services.borgmatic.enable = true`.
           This value is passed to the systemd timer configuration as
diff --git a/modules/services/cachix-agent.nix b/modules/services/cachix-agent.nix
index 4cf81009e..7b29b3c4a 100644
--- a/modules/services/cachix-agent.nix
+++ b/modules/services/cachix-agent.nix
@@ -10,20 +10,20 @@ in {
   meta.maintainers = [ maintainers.rycee ];
 
   options.services.cachix-agent = {
-    enable = mkEnableOption
-      (lib.mdDoc "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>");
+    enable =
+      mkEnableOption "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>";
 
     name = mkOption {
       type = types.str;
-      description = lib.mdDoc "The unique agent name.";
+      description = "The unique agent name.";
     };
 
-    verbose = mkEnableOption (lib.mdDoc "verbose output");
+    verbose = mkEnableOption "verbose output";
 
     profile = mkOption {
       type = types.str;
       default = "home-manager";
-      description = lib.mdDoc ''
+      description = ''
         The Nix profile name.
       '';
     };
@@ -31,17 +31,17 @@ in {
     host = mkOption {
       type = types.nullOr types.str;
       default = null;
-      description = lib.mdDoc "Cachix URI to use.";
+      description = "Cachix URI to use.";
     };
 
-    package = mkPackageOptionMD pkgs "cachix" { };
+    package = mkPackageOption pkgs "cachix" { };
 
     credentialsFile = mkOption {
       type = types.path;
       default = "${config.xdg.configHome}/cachix-agent.token";
       defaultText =
         literalExpression ''"''${config.xdg.configHome}/cachix-agent.token"'';
-      description = lib.mdDoc ''
+      description = ''
         Required file that needs to contain
         `CACHIX_AGENT_TOKEN=...`.
       '';
diff --git a/modules/services/caffeine.nix b/modules/services/caffeine.nix
index 3b8f014b6..28ebc7f13 100644
--- a/modules/services/caffeine.nix
+++ b/modules/services/caffeine.nix
@@ -10,9 +10,7 @@ in {
   meta.maintainers = [ maintainers.uvnikita ];
 
   options = {
-    services.caffeine = {
-      enable = mkEnableOption (lib.mdDoc "Caffeine service");
-    };
+    services.caffeine = { enable = mkEnableOption "Caffeine service"; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/services/cbatticon.nix b/modules/services/cbatticon.nix
index 64e488e31..1216878ca 100644
--- a/modules/services/cbatticon.nix
+++ b/modules/services/cbatticon.nix
@@ -31,7 +31,7 @@ in {
 
   options = {
     services.cbatticon = {
-      enable = mkEnableOption (lib.mdDoc "cbatticon");
+      enable = mkEnableOption "cbatticon";
 
       commandCriticalLevel = mkOption {
         type = types.nullOr types.lines;
@@ -39,7 +39,7 @@ in {
         example = ''
           notify-send "battery critical!"
         '';
-        description = lib.mdDoc ''
+        description = ''
           Command to execute when the critical battery level is reached.
         '';
       };
@@ -47,7 +47,7 @@ in {
       commandLeftClick = mkOption {
         type = types.nullOr types.lines;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Command to execute when left clicking on the tray icon.
         '';
       };
@@ -57,14 +57,14 @@ in {
           types.nullOr (types.enum [ "standard" "notification" "symbolic" ]);
         default = null;
         example = "symbolic";
-        description = lib.mdDoc "Icon type to display in the system tray.";
+        description = "Icon type to display in the system tray.";
       };
 
       lowLevelPercent = mkOption {
         type = types.nullOr (types.ints.between 0 100);
         default = null;
         example = 20;
-        description = lib.mdDoc ''
+        description = ''
           Low level percentage of the battery in percent (without the
           percent symbol).
         '';
@@ -74,7 +74,7 @@ in {
         type = types.nullOr (types.ints.between 0 100);
         default = null;
         example = 5;
-        description = lib.mdDoc ''
+        description = ''
           Critical level percentage of the battery in percent (without
           the percent symbol).
         '';
@@ -84,7 +84,7 @@ in {
         type = types.nullOr types.ints.positive;
         default = null;
         example = 5;
-        description = lib.mdDoc ''
+        description = ''
           Number of seconds between updates of the battery information.
         '';
       };
@@ -92,7 +92,7 @@ in {
       hideNotification = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc "Hide the notification popups.";
+        description = "Hide the notification popups.";
       };
     };
   };
diff --git a/modules/services/clipman.nix b/modules/services/clipman.nix
index 1abbb5206..4616c2984 100644
--- a/modules/services/clipman.nix
+++ b/modules/services/clipman.nix
@@ -5,16 +5,15 @@ in {
   meta.maintainers = [ maintainers.jwygoda ];
 
   options.services.clipman = {
-    enable = mkEnableOption
-      (lib.mdDoc "clipman, a simple clipboard manager for Wayland");
+    enable = mkEnableOption "clipman, a simple clipboard manager for Wayland";
 
-    package = mkPackageOptionMD pkgs "clipman" { };
+    package = mkPackageOption pkgs "clipman" { };
 
     systemdTarget = mkOption {
       type = types.str;
       default = "graphical-session.target";
       example = "sway-session.target";
-      description = lib.mdDoc ''
+      description = ''
         The systemd target that will automatically start the clipman service.
 
         When setting this value to `"sway-session.target"`,
diff --git a/modules/services/clipmenu.nix b/modules/services/clipmenu.nix
index 2e4abd92c..c55166b3a 100644
--- a/modules/services/clipmenu.nix
+++ b/modules/services/clipmenu.nix
@@ -10,21 +10,20 @@ in {
   meta.maintainers = [ maintainers.DamienCassou ];
 
   options.services.clipmenu = {
-    enable =
-      mkEnableOption (lib.mdDoc "clipmenu, the clipboard management daemon");
+    enable = mkEnableOption "clipmenu, the clipboard management daemon";
 
     package = mkOption {
       type = types.package;
       default = pkgs.clipmenu;
       defaultText = "pkgs.clipmenu";
-      description = lib.mdDoc "clipmenu derivation to use.";
+      description = "clipmenu derivation to use.";
     };
 
     launcher = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "rofi";
-      description = lib.mdDoc ''
+      description = ''
         Launcher command, if not set, {command}`dmenu`
         will be used by default.
       '';
diff --git a/modules/services/comodoro.nix b/modules/services/comodoro.nix
index c5c3e0659..cf298ce82 100644
--- a/modules/services/comodoro.nix
+++ b/modules/services/comodoro.nix
@@ -15,9 +15,9 @@ in {
   meta.maintainers = with lib.hm.maintainers; [ soywod ];
 
   options.services.comodoro = {
-    enable = lib.mkEnableOption (lib.mdDoc "Comodoro server");
+    enable = lib.mkEnableOption "Comodoro server";
 
-    package = lib.mkPackageOptionMD pkgs "comodoro" { };
+    package = lib.mkPackageOption pkgs "comodoro" { };
 
     environment = lib.mkOption {
       type = with lib.types; attrsOf str;
@@ -27,21 +27,21 @@ in {
           "PASSWORD_STORE_DIR" = "~/.password-store";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra environment variables to be exported in the service.
       '';
     };
 
     preset = lib.mkOption {
       type = lib.types.nonEmptyStr;
-      description = lib.mdDoc ''
+      description = ''
         Use configuration from the given preset as defined in the configuration file.
       '';
     };
 
     protocols = lib.mkOption {
       type = with lib.types; nonEmptyListOf nonEmptyStr;
-      description = lib.mdDoc ''
+      description = ''
         Define protocols the server should use to accept requests.
       '';
     };
diff --git a/modules/services/copyq.nix b/modules/services/copyq.nix
index 23765b52d..32e83978b 100644
--- a/modules/services/copyq.nix
+++ b/modules/services/copyq.nix
@@ -8,16 +8,16 @@ in {
   meta.maintainers = [ lib.maintainers.DamienCassou ];
 
   options.services.copyq = {
-    enable = lib.mkEnableOption
-      (lib.mdDoc "CopyQ, a clipboard manager with advanced features");
+    enable =
+      lib.mkEnableOption "CopyQ, a clipboard manager with advanced features";
 
-    package = lib.mkPackageOptionMD pkgs "copyq" { };
+    package = lib.mkPackageOption pkgs "copyq" { };
 
     systemdTarget = lib.mkOption {
       type = lib.types.str;
       default = "graphical-session.target";
       example = "sway-session.target";
-      description = lib.mdDoc ''
+      description = ''
         The systemd target that will automatically start the CopyQ service.
 
         When setting this value to `"sway-session.target"`,
diff --git a/modules/services/devilspie2.nix b/modules/services/devilspie2.nix
index 68f1a4f22..fa77153e7 100644
--- a/modules/services/devilspie2.nix
+++ b/modules/services/devilspie2.nix
@@ -7,14 +7,14 @@ in {
 
   options = {
     services.devilspie2 = {
-      enable = mkEnableOption (lib.mdDoc ''
+      enable = mkEnableOption ''
         Devilspie2, a window matching utility, allowing the user to
-        perform scripted actions on windows as they are created'');
+        perform scripted actions on windows as they are created'';
 
       config = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Content of file placed in the devilspie2 config directory.
         '';
         example = ''
diff --git a/modules/services/dropbox.nix b/modules/services/dropbox.nix
index fd8eb2e7b..941f4d82e 100644
--- a/modules/services/dropbox.nix
+++ b/modules/services/dropbox.nix
@@ -14,7 +14,7 @@ in {
 
   options = {
     services.dropbox = {
-      enable = mkEnableOption (lib.mdDoc "Dropbox daemon");
+      enable = mkEnableOption "Dropbox daemon";
 
       path = mkOption {
         type = types.path;
@@ -22,7 +22,7 @@ in {
         defaultText =
           literalExpression ''"''${config.home.homeDirectory}/Dropbox"'';
         apply = toString; # Prevent copies to Nix store.
-        description = lib.mdDoc "Where to put the Dropbox directory.";
+        description = "Where to put the Dropbox directory.";
       };
     };
   };
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index c678d2f4b..daa800cf0 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -26,20 +26,20 @@ let
       package = mkOption {
         type = types.package;
         example = literalExpression "pkgs.gnome.adwaita-icon-theme";
-        description = lib.mdDoc "Package providing the theme.";
+        description = "Package providing the theme.";
       };
 
       name = mkOption {
         type = types.str;
         example = "Adwaita";
-        description = lib.mdDoc "The name of the theme within the package.";
+        description = "The name of the theme within the package.";
       };
 
       size = mkOption {
         type = types.str;
         default = "32x32";
         example = "16x16";
-        description = lib.mdDoc "The desired icon size.";
+        description = "The desired icon size.";
       };
     };
   };
@@ -55,20 +55,20 @@ in {
 
   options = {
     services.dunst = {
-      enable = mkEnableOption (lib.mdDoc "the dunst notification daemon");
+      enable = mkEnableOption "the dunst notification daemon";
 
       package = mkOption {
         type = types.package;
         default = pkgs.dunst;
         defaultText = literalExpression "pkgs.dunst";
-        description = lib.mdDoc "Package providing {command}`dunst`.";
+        description = "Package providing {command}`dunst`.";
       };
 
       configFile = mkOption {
         type = with types; either str path;
         default = "${config.xdg.configHome}/dunst/dunstrc";
         defaultText = "$XDG_CONFIG_HOME/dunst/dunstrc";
-        description = lib.mdDoc ''
+        description = ''
           Path to the configuration file read by dunst.
 
           Note that the configuration generated by Home Manager will be
@@ -82,13 +82,13 @@ in {
       iconTheme = mkOption {
         type = themeType;
         default = hicolorTheme;
-        description = lib.mdDoc "Set the icon theme.";
+        description = "Set the icon theme.";
       };
 
       waylandDisplay = mkOption {
         type = types.str;
         default = "";
-        description = lib.mdDoc
+        description =
           "Set the service's {env}`WAYLAND_DISPLAY` environment variable.";
       };
 
@@ -98,12 +98,12 @@ in {
           options = {
             global.icon_path = mkOption {
               type = types.separatedString ":";
-              description = lib.mdDoc "Paths where dunst will look for icons.";
+              description = "Paths where dunst will look for icons.";
             };
           };
         };
         default = { };
-        description = lib.mdDoc
+        description =
           "Configuration written to {file}`$XDG_CONFIG_HOME/dunst/dunstrc`.";
         example = literalExpression ''
           {
diff --git a/modules/services/dwm-status.nix b/modules/services/dwm-status.nix
index 78ebc891d..c3295faac 100644
--- a/modules/services/dwm-status.nix
+++ b/modules/services/dwm-status.nix
@@ -16,19 +16,19 @@ let
 in {
   options = {
     services.dwm-status = {
-      enable = mkEnableOption (lib.mdDoc "dwm-status user service");
+      enable = mkEnableOption "dwm-status user service";
 
       package = mkOption {
         type = types.package;
         default = pkgs.dwm-status;
         defaultText = literalExpression "pkgs.dwm-status";
         example = "pkgs.dwm-status.override { enableAlsaUtils = false; }";
-        description = lib.mdDoc "Which dwm-status package to use.";
+        description = "Which dwm-status package to use.";
       };
 
       order = mkOption {
         type = types.listOf (types.enum features);
-        description = lib.mdDoc "List of enabled features in order.";
+        description = "List of enabled features in order.";
       };
 
       extraConfig = mkOption {
@@ -47,7 +47,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc "Extra config of dwm-status.";
+        description = "Extra config of dwm-status.";
       };
     };
   };
diff --git a/modules/services/easyeffects.nix b/modules/services/easyeffects.nix
index f14330e10..fd5e4b404 100644
--- a/modules/services/easyeffects.nix
+++ b/modules/services/easyeffects.nix
@@ -12,25 +12,25 @@ in {
   meta.maintainers = [ maintainers.fufexan ];
 
   options.services.easyeffects = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       Easyeffects daemon.
       Note, it is necessary to add
       ```nix
       programs.dconf.enable = true;
       ```
-      to your system configuration for the daemon to work correctly'');
+      to your system configuration for the daemon to work correctly'';
 
     package = mkOption {
       type = types.package;
       default = pkgs.easyeffects;
       defaultText = literalExpression "pkgs.easyeffects";
-      description = lib.mdDoc "The `easyeffects` package to use.";
+      description = "The `easyeffects` package to use.";
     };
 
     preset = mkOption {
       type = types.str;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Which preset to use when starting easyeffects.
         Will likely need to launch easyeffects to initially create preset.
       '';
diff --git a/modules/services/emacs.nix b/modules/services/emacs.nix
index e8a888dab..64c6c6eee 100644
--- a/modules/services/emacs.nix
+++ b/modules/services/emacs.nix
@@ -42,7 +42,7 @@ in {
   meta.maintainers = [ maintainers.tadfisher ];
 
   options.services.emacs = {
-    enable = mkEnableOption (lib.mdDoc "the Emacs daemon");
+    enable = mkEnableOption "the Emacs daemon";
 
     package = mkOption {
       type = types.package;
@@ -51,25 +51,24 @@ in {
         if config.programs.emacs.enable then config.programs.emacs.finalPackage
         else pkgs.emacs
       '';
-      description = lib.mdDoc "The Emacs package to use.";
+      description = "The Emacs package to use.";
     };
 
     extraOptions = mkOption {
       type = with types; listOf str;
       default = [ ];
       example = [ "-f" "exwm-enable" ];
-      description = lib.mdDoc ''
+      description = ''
         Extra command-line arguments to pass to {command}`emacs`.
       '';
     };
 
     client = {
-      enable =
-        mkEnableOption (lib.mdDoc "generation of Emacs client desktop file");
+      enable = mkEnableOption "generation of Emacs client desktop file";
       arguments = mkOption {
         type = with types; listOf str;
         default = [ "-c" ];
-        description = lib.mdDoc ''
+        description = ''
           Command-line arguments to pass to {command}`emacsclient`.
         '';
       };
@@ -79,8 +78,7 @@ in {
     # socket path, though allowing for such is not easy to do as systemd socket
     # units don't perform variable expansion for 'ListenStream'.
     socketActivation = {
-      enable = mkEnableOption
-        (lib.mdDoc "systemd socket activation for the Emacs service");
+      enable = mkEnableOption "systemd socket activation for the Emacs service";
     };
 
     startWithUserSession = mkOption {
@@ -89,7 +87,7 @@ in {
       defaultText =
         literalExpression "!config.services.emacs.socketActivation.enable";
       example = "graphical";
-      description = lib.mdDoc ''
+      description = ''
         Whether to launch Emacs service with the systemd user session. If it is
         `true`, Emacs service is started by
         `default.target`. If it is
@@ -102,7 +100,7 @@ in {
       type = types.bool;
       default = false;
       example = !default;
-      description = lib.mdDoc ''
+      description = ''
         Whether to configure {command}`emacsclient` as the default
         editor using the {env}`EDITOR` environment variable.
       '';
diff --git a/modules/services/espanso.nix b/modules/services/espanso.nix
index 9e44f9beb..404dfecd8 100644
--- a/modules/services/espanso.nix
+++ b/modules/services/espanso.nix
@@ -22,12 +22,11 @@ in {
   ];
   options = {
     services.espanso = {
-      enable = mkEnableOption
-        (lib.mdDoc "Espanso: cross platform text expander in Rust");
+      enable = mkEnableOption "Espanso: cross platform text expander in Rust";
 
       package = mkOption {
         type = types.package;
-        description = lib.mdDoc "Which espanso package to use";
+        description = "Which espanso package to use";
         default = pkgs.espanso;
         defaultText = literalExpression "pkgs.espanso";
       };
@@ -46,7 +45,7 @@ in {
             };
           };
         '';
-        description = lib.mdDoc ''
+        description = ''
           The Espanso configuration to use. See
           <https://espanso.org/docs/configuration/basics/>
           for a description of available options.
@@ -90,7 +89,7 @@ in {
             };
           };
         '';
-        description = lib.mdDoc ''
+        description = ''
           The Espanso matches to use. See
           <https://espanso.org/docs/matches/basics/>
           for a description of available options.
diff --git a/modules/services/etesync-dav.nix b/modules/services/etesync-dav.nix
index 5119deb6a..5fd58d092 100644
--- a/modules/services/etesync-dav.nix
+++ b/modules/services/etesync-dav.nix
@@ -14,19 +14,19 @@ in {
   meta.maintainers = [ maintainers.valodim ];
 
   options.services.etesync-dav = {
-    enable = mkEnableOption (lib.mdDoc "etesync-dav");
+    enable = mkEnableOption "etesync-dav";
 
     package = mkOption {
       type = types.package;
       default = pkgs.etesync-dav;
       defaultText = "pkgs.etesync-dav";
-      description = lib.mdDoc "The etesync-dav derivation to use.";
+      description = "The etesync-dav derivation to use.";
     };
 
     serverUrl = mkOption {
       type = types.str;
       default = "https://api.etesync.com/";
-      description = lib.mdDoc "The URL to the etesync server.";
+      description = "The URL to the etesync server.";
     };
 
     settings = mkOption {
@@ -38,7 +38,7 @@ in {
           ETESYNC_LISTEN_PORT = 37358;
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Settings for etesync-dav, passed as environment variables.
       '';
     };
diff --git a/modules/services/flameshot.nix b/modules/services/flameshot.nix
index 1b07e05fa..0c2435aeb 100644
--- a/modules/services/flameshot.nix
+++ b/modules/services/flameshot.nix
@@ -14,13 +14,13 @@ in {
   meta.maintainers = [ maintainers.hamhut1066 ];
 
   options.services.flameshot = {
-    enable = mkEnableOption (lib.mdDoc "Flameshot");
+    enable = mkEnableOption "Flameshot";
 
     package = mkOption {
       type = types.package;
       default = pkgs.flameshot;
       defaultText = literalExpression "pkgs.flameshot";
-      description = lib.mdDoc "Package providing {command}`flameshot`.";
+      description = "Package providing {command}`flameshot`.";
     };
 
     settings = mkOption {
@@ -32,7 +32,7 @@ in {
           showStartupLaunchMessage = false;
         };
       };
-      description = lib.mdDoc ''
+      description = ''
         Configuration to use for Flameshot. See
         <https://github.com/flameshot-org/flameshot/blob/master/flameshot.example.ini>
         for available options.
diff --git a/modules/services/fluidsynth.nix b/modules/services/fluidsynth.nix
index cb2666085..dbeb8df7a 100644
--- a/modules/services/fluidsynth.nix
+++ b/modules/services/fluidsynth.nix
@@ -11,12 +11,12 @@ in {
 
   options = {
     services.fluidsynth = {
-      enable = mkEnableOption (lib.mdDoc "fluidsynth midi synthesizer");
+      enable = mkEnableOption "fluidsynth midi synthesizer";
 
       soundFont = mkOption {
         type = types.path;
         default = "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2";
-        description = lib.mdDoc ''
+        description = ''
           The soundfont file to use, in SoundFont 2 format.
         '';
       };
@@ -25,7 +25,7 @@ in {
         type = types.enum [ "jack" "pipewire-pulse" "pulseaudio" ];
         default = "pulseaudio";
         example = "pipewire-pulse";
-        description = lib.mdDoc ''
+        description = ''
           The systemd sound service to depend on.
         '';
       };
@@ -34,7 +34,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "--sample-rate 96000" ];
-        description = lib.mdDoc ''
+        description = ''
           Extra arguments, added verbatim to the fluidsynth command. See
           {manpage}`fluidsynth.conf(1)`.
         '';
diff --git a/modules/services/fnott.nix b/modules/services/fnott.nix
index 636f9f498..3d2d1dd8a 100644
--- a/modules/services/fnott.nix
+++ b/modules/services/fnott.nix
@@ -13,22 +13,22 @@ in {
 
   options = {
     services.fnott = {
-      enable = mkEnableOption (lib.mdDoc ''
+      enable = mkEnableOption ''
         fnott, a lightweight Wayland notification daemon for wlroots-based compositors
-      '');
+      '';
 
       package = mkOption {
         type = types.package;
         default = pkgs.fnott;
         defaultText = literalExpression "pkgs.fnott";
-        description = lib.mdDoc "Package providing {command}`fnott`.";
+        description = "Package providing {command}`fnott`.";
       };
 
       extraFlags = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "-s" ];
-        description = lib.mdDoc ''
+        description = ''
           Extra arguments to use for executing fnott.
         '';
       };
@@ -37,7 +37,7 @@ in {
         type = types.either types.str types.path;
         default = "${config.xdg.configHome}/fnott/fnott.ini";
         defaultText = "$XDG_CONFIG_HOME/fnott/fnott.ini";
-        description = lib.mdDoc ''
+        description = ''
           Path to the configuration file read by fnott.
 
           Note that environment variables in the path won't be properly expanded.
@@ -53,7 +53,7 @@ in {
       settings = mkOption {
         type = iniFormat.type;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/fnott/fnott.ini`.
 
diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix
index dce59c36d..e0ced9769 100644
--- a/modules/services/fusuma.nix
+++ b/modules/services/fusuma.nix
@@ -59,14 +59,14 @@ in {
   meta.maintainers = [ hm.maintainers.iosmanthus ];
 
   options.services.fusuma = {
-    enable = mkEnableOption (lib.mdDoc
-      "the fusuma systemd service to automatically enable touchpad gesture");
+    enable = mkEnableOption
+      "the fusuma systemd service to automatically enable touchpad gesture";
 
     package = mkOption {
       type = types.package;
       default = pkgs.fusuma;
       defaultText = literalExpression "pkgs.fusuma";
-      description = lib.mdDoc "Package providing {command}`fusuma`.";
+      description = "Package providing {command}`fusuma`.";
     };
 
     settings = mkOption {
@@ -89,7 +89,7 @@ in {
           };
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         YAML config that will override the default fusuma configuration.
       '';
     };
@@ -101,7 +101,7 @@ in {
       example = literalExpression ''
         with pkgs; [ coreutils xdotool ];
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra packages needs to bring to the scope of fusuma service.
       '';
     };
diff --git a/modules/services/getmail.nix b/modules/services/getmail.nix
index 85648a69b..7357987ea 100644
--- a/modules/services/getmail.nix
+++ b/modules/services/getmail.nix
@@ -17,14 +17,14 @@ let
 in {
   options = {
     services.getmail = {
-      enable = mkEnableOption (lib.mdDoc
-        "the getmail systemd service to automatically retrieve mail");
+      enable = mkEnableOption
+        "the getmail systemd service to automatically retrieve mail";
 
       frequency = mkOption {
         type = types.str;
         default = "*:0/5";
         example = "hourly";
-        description = lib.mdDoc ''
+        description = ''
           The refresh frequency. Check `man systemd.time` for
           more information on the syntax. If you use a gpg-agent in
           combination with the passwordCommand, keep the poll
diff --git a/modules/services/git-sync.nix b/modules/services/git-sync.nix
index 7c5409b07..770cec0ff 100644
--- a/modules/services/git-sync.nix
+++ b/modules/services/git-sync.nix
@@ -35,18 +35,18 @@ let
         internal = true;
         default = name;
         type = types.str;
-        description = lib.mdDoc "The name that should be given to this unit.";
+        description = "The name that should be given to this unit.";
       };
 
       path = mkOption {
         type = types.path;
-        description = lib.mdDoc "The path at which to sync the repository";
+        description = "The path at which to sync the repository";
       };
 
       uri = mkOption {
         type = types.str;
         example = "git+ssh://user@example.com:/~[user]/path/to/repo.git";
-        description = lib.mdDoc ''
+        description = ''
           The URI of the remote to be synchronized. This is only used in the
           event that the directory does not already exist. See
           <https://git-scm.com/docs/git-clone#_git_urls>
@@ -57,7 +57,7 @@ let
       interval = mkOption {
         type = types.int;
         default = 500;
-        description = lib.mdDoc ''
+        description = ''
           The interval, specified in seconds, at which the synchronization will
           be triggered even without filesystem changes.
         '';
@@ -70,20 +70,20 @@ in {
 
   options = {
     services.git-sync = {
-      enable = mkEnableOption (lib.mdDoc "git-sync services");
+      enable = mkEnableOption "git-sync services";
 
       package = mkOption {
         type = types.package;
         default = pkgs.git-sync;
         defaultText = literalExpression "pkgs.git-sync";
-        description = lib.mdDoc ''
+        description = ''
           Package containing the {command}`git-sync` program.
         '';
       };
 
       repositories = mkOption {
         type = with types; attrsOf repositoryType;
-        description = lib.mdDoc ''
+        description = ''
           The repositories that should be synchronized.
         '';
       };
diff --git a/modules/services/gnome-keyring.nix b/modules/services/gnome-keyring.nix
index ad543a380..460e4abd1 100644
--- a/modules/services/gnome-keyring.nix
+++ b/modules/services/gnome-keyring.nix
@@ -11,12 +11,12 @@ in {
 
   options = {
     services.gnome-keyring = {
-      enable = mkEnableOption (lib.mdDoc "GNOME Keyring");
+      enable = mkEnableOption "GNOME Keyring";
 
       components = mkOption {
         type = types.listOf (types.enum [ "pkcs11" "secrets" "ssh" ]);
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           The GNOME keyring components to start. If empty then the
           default set of components will be started.
         '';
diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 5c96aecc8..63ba11c77 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -75,12 +75,12 @@ in {
 
   options = {
     services.gpg-agent = {
-      enable = mkEnableOption (lib.mdDoc "GnuPG private key agent");
+      enable = mkEnableOption "GnuPG private key agent";
 
       defaultCacheTtl = mkOption {
         type = types.nullOr types.int;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Set the time a cache entry is valid to the given number of
           seconds.
         '';
@@ -89,7 +89,7 @@ in {
       defaultCacheTtlSsh = mkOption {
         type = types.nullOr types.int;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Set the time a cache entry used for SSH keys is valid to the
           given number of seconds.
         '';
@@ -98,7 +98,7 @@ in {
       maxCacheTtl = mkOption {
         type = types.nullOr types.int;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Set the maximum time a cache entry is valid to n seconds. After this
           time a cache entry will be expired even if it has been accessed
           recently or has been set using gpg-preset-passphrase. The default is
@@ -109,7 +109,7 @@ in {
       maxCacheTtlSsh = mkOption {
         type = types.nullOr types.int;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Set the maximum time a cache entry used for SSH keys is valid to n
           seconds. After this time a cache entry will be expired even if it has
           been accessed recently or has been set using gpg-preset-passphrase.
@@ -120,7 +120,7 @@ in {
       enableSshSupport = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to use the GnuPG key agent for SSH keys.
         '';
       };
@@ -128,7 +128,7 @@ in {
       sshKeys = mkOption {
         type = types.nullOr (types.listOf types.str);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Which GPG keys (by keygrip) to expose as SSH keys.
         '';
       };
@@ -136,7 +136,7 @@ in {
       enableExtraSocket = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable extra socket of the GnuPG key agent (useful for GPG
           Agent forwarding).
         '';
@@ -145,7 +145,7 @@ in {
       verbose = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to produce verbose output.
         '';
       };
@@ -153,7 +153,7 @@ in {
       grabKeyboardAndMouse = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Tell the pinentry to grab the keyboard and mouse. This
           option should in general be used to avoid X-sniffing
           attacks. When disabled, this option passes
@@ -164,7 +164,7 @@ in {
       enableScDaemon = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Make use of the scdaemon tool. This option has the effect of
           enabling the ability to do smartcard operations. When
           disabled, this option passes
@@ -179,7 +179,7 @@ in {
           allow-emacs-pinentry
           allow-loopback-pinentry
         '';
-        description = lib.mdDoc ''
+        description = ''
           Extra configuration lines to append to the gpg-agent
           configuration file.
         '';
@@ -189,7 +189,7 @@ in {
         type = types.nullOr (types.enum pkgs.pinentry.flavors);
         example = "gnome3";
         default = "gtk2";
-        description = lib.mdDoc ''
+        description = ''
           Which pinentry interface to use. If not
           `null`, it sets
           {option}`pinentry-program` in
@@ -205,15 +205,15 @@ in {
         '';
       };
 
-      enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
+      enableBashIntegration = mkEnableOption "Bash integration" // {
         default = true;
       };
 
-      enableZshIntegration = mkEnableOption (lib.mdDoc "Zsh integration") // {
+      enableZshIntegration = mkEnableOption "Zsh integration" // {
         default = true;
       };
 
-      enableFishIntegration = mkEnableOption (lib.mdDoc "Fish integration") // {
+      enableFishIntegration = mkEnableOption "Fish integration" // {
         default = true;
       };
     };
diff --git a/modules/services/grobi.nix b/modules/services/grobi.nix
index 2b45a16fa..e656a763f 100644
--- a/modules/services/grobi.nix
+++ b/modules/services/grobi.nix
@@ -14,13 +14,13 @@ in {
 
   options = {
     services.grobi = {
-      enable = mkEnableOption (lib.mdDoc "the grobi display setup daemon");
+      enable = mkEnableOption "the grobi display setup daemon";
 
       executeAfter = mkOption {
         type = with types; listOf str;
         default = [ ];
         example = [ "setxkbmap dvorak" ];
-        description = lib.mdDoc ''
+        description = ''
           Commands to be run after an output configuration was
           changed. The Nix value declared here will be translated to
           JSON and written to the {option}`execute_after` key
@@ -57,7 +57,7 @@ in {
             }
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           These are the rules grobi tries to match to the current
           output configuration. The rules are evaluated top to bottom,
           the first matching rule is applied and processing stops. See
diff --git a/modules/services/gromit-mpx.nix b/modules/services/gromit-mpx.nix
index 92956d75c..f46eddb39 100644
--- a/modules/services/gromit-mpx.nix
+++ b/modules/services/gromit-mpx.nix
@@ -63,7 +63,7 @@ let
       device = mkOption {
         type = types.str;
         example = "default";
-        description = lib.mdDoc ''
+        description = ''
           Use this tool with the given xinput device.  The device with
           the name default works with any input.
         '';
@@ -73,28 +73,28 @@ let
         type = types.enum [ "pen" "eraser" "recolor" ];
         default = "pen";
         example = "eraser";
-        description = lib.mdDoc "Which type of tool this is.";
+        description = "Which type of tool this is.";
       };
 
       color = mkOption {
         type = types.str;
         default = "red";
         example = "#ff00ff";
-        description = lib.mdDoc "The stroke (or recolor) color of the tool.";
+        description = "The stroke (or recolor) color of the tool.";
       };
 
       size = mkOption {
         type = types.ints.positive;
         default = 5;
         example = 3;
-        description = lib.mdDoc "The tool size.";
+        description = "The tool size.";
       };
 
       arrowSize = mkOption {
         type = types.nullOr types.ints.positive;
         default = null;
         example = 2;
-        description = lib.mdDoc ''
+        description = ''
           If not `null`, automatically draw an arrow
           at the end of a stroke with the given size.
         '';
@@ -104,7 +104,7 @@ let
         type = types.listOf (types.enum modsAndButtons);
         default = [ ];
         example = [ "SHIFT" ];
-        description = lib.mdDoc ''
+        description = ''
           Only activate this tool if the given modifiers are also active.
         '';
       };
@@ -115,20 +115,20 @@ in {
   meta.maintainers = [ maintainers.pjones ];
 
   options.services.gromit-mpx = {
-    enable = mkEnableOption (lib.mdDoc "Gromit-MPX annotation tool");
+    enable = mkEnableOption "Gromit-MPX annotation tool";
 
     package = mkOption {
       type = types.package;
       default = pkgs.gromit-mpx;
       defaultText = "pkgs.gromit-mpx";
-      description = lib.mdDoc "The gromit-mpx package to use.";
+      description = "The gromit-mpx package to use.";
     };
 
     hotKey = mkOption {
       type = with types; nullOr (either str ints.positive);
       default = "F9";
       example = "Insert";
-      description = lib.mdDoc ''
+      description = ''
         A keysym or raw keycode that toggles the activation state of
         gromit-mpx.  Set to `null` to disable the
         hotkey in which case you'll have to activate gromit-mpx
@@ -139,7 +139,7 @@ in {
     undoKey = mkOption {
       type = with types; nullOr (either str ints.positive);
       default = "F10";
-      description = lib.mdDoc ''
+      description = ''
         A keysym or raw keycode that causes gromit-mpx to undo the
         last stroke.  Use this key along with the shift key to redo an
         undone stoke.  Set to `null` to disable the
@@ -153,7 +153,7 @@ in {
       };
       default = 0.75;
       example = 1.0;
-      description = lib.mdDoc "Opacity of the drawing overlay.";
+      description = "Opacity of the drawing overlay.";
     };
 
     tools = mkOption {
@@ -194,7 +194,7 @@ in {
           modifiers = [ "3" ];
         }
       ];
-      description = lib.mdDoc ''
+      description = ''
         Tool definitions for gromit-mpx to use.
       '';
     };
diff --git a/modules/services/home-manager-auto-upgrade.nix b/modules/services/home-manager-auto-upgrade.nix
index 3b8baa8e3..659f91181 100644
--- a/modules/services/home-manager-auto-upgrade.nix
+++ b/modules/services/home-manager-auto-upgrade.nix
@@ -13,14 +13,14 @@ in {
 
   options = {
     services.home-manager.autoUpgrade = {
-      enable = lib.mkEnableOption (lib.mdDoc ''
+      enable = lib.mkEnableOption ''
         the Home Manager upgrade service that periodically updates your Nix
-        channels before running `home-manager switch`'');
+        channels before running `home-manager switch`'';
 
       frequency = lib.mkOption {
         type = lib.types.str;
         example = "weekly";
-        description = lib.mdDoc ''
+        description = ''
           The interval at which the Home Manager auto upgrade is run.
           This value is passed to the systemd timer configuration
           as the `OnCalendar` option.
diff --git a/modules/services/hound.nix b/modules/services/hound.nix
index b031fa044..ff18a381a 100644
--- a/modules/services/hound.nix
+++ b/modules/services/hound.nix
@@ -21,25 +21,25 @@ in {
   meta.maintainers = [ maintainers.adisbladis ];
 
   options.services.hound = {
-    enable = mkEnableOption (lib.mdDoc "hound");
+    enable = mkEnableOption "hound";
 
     maxConcurrentIndexers = mkOption {
       type = types.ints.positive;
       default = 2;
-      description = lib.mdDoc "Limit the amount of concurrent indexers.";
+      description = "Limit the amount of concurrent indexers.";
     };
 
     databasePath = mkOption {
       type = types.path;
       default = "${config.xdg.dataHome}/hound";
       defaultText = "$XDG_DATA_HOME/hound";
-      description = lib.mdDoc "The Hound database path.";
+      description = "The Hound database path.";
     };
 
     listenAddress = mkOption {
       type = types.str;
       default = "localhost:6080";
-      description = lib.mdDoc "Listen address of the Hound daemon.";
+      description = "Listen address of the Hound daemon.";
     };
 
     repositories = mkOption {
@@ -54,7 +54,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc "The repository configuration.";
+      description = "The repository configuration.";
     };
   };
 
diff --git a/modules/services/imapnotify-accounts.nix b/modules/services/imapnotify-accounts.nix
index 6dec9dcae..e437f94e3 100644
--- a/modules/services/imapnotify-accounts.nix
+++ b/modules/services/imapnotify-accounts.nix
@@ -4,13 +4,13 @@ with lib;
 
 {
   options.imapnotify = {
-    enable = mkEnableOption (lib.mdDoc "imapnotify");
+    enable = mkEnableOption "imapnotify";
 
     onNotify = mkOption {
       type = with types; either str (attrsOf str);
       default = "";
       example = "\${pkgs.isync}/bin/mbsync test-%s";
-      description = lib.mdDoc "Shell commands to run on any event.";
+      description = "Shell commands to run on any event.";
     };
 
     onNotifyPost = mkOption {
@@ -20,22 +20,21 @@ with lib;
         mail =
           "\${pkgs.notmuch}/bin/notmuch new && \${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
       };
-      description = lib.mdDoc "Shell commands to run after onNotify event.";
+      description = "Shell commands to run after onNotify event.";
     };
 
     boxes = mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [ "Inbox" "[Gmail]/MyLabel" ];
-      description = lib.mdDoc "IMAP folders to watch.";
+      description = "IMAP folders to watch.";
     };
 
     extraConfig = mkOption {
       type = let jsonFormat = pkgs.formats.json { }; in jsonFormat.type;
       default = { };
       example = { wait = 10; };
-      description =
-        lib.mdDoc "Additional configuration to add for this account.";
+      description = "Additional configuration to add for this account.";
     };
   };
 }
diff --git a/modules/services/imapnotify.nix b/modules/services/imapnotify.nix
index 9c9fdd0eb..a79cba35e 100644
--- a/modules/services/imapnotify.nix
+++ b/modules/services/imapnotify.nix
@@ -87,14 +87,14 @@ in {
 
   options = {
     services.imapnotify = {
-      enable = mkEnableOption (lib.mdDoc "imapnotify");
+      enable = mkEnableOption "imapnotify";
 
       package = mkOption {
         type = types.package;
         default = pkgs.goimapnotify;
         defaultText = literalExpression "pkgs.goimapnotify";
         example = literalExpression "pkgs.imapnotify";
-        description = lib.mdDoc "The imapnotify package to use";
+        description = "The imapnotify package to use";
       };
     };
 
diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix
index f3ed0b7f4..3297d5fb0 100644
--- a/modules/services/kanshi.nix
+++ b/modules/services/kanshi.nix
@@ -11,7 +11,7 @@ let
 
       criteria = mkOption {
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           The criteria can either be an output name, an output description or "*".
           The latter can be used to match any output.
 
@@ -25,7 +25,7 @@ let
       status = mkOption {
         type = types.nullOr (types.enum [ "enable" "disable" ]);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Enables or disables the specified output.
         '';
       };
@@ -34,7 +34,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "1920x1080@60Hz";
-        description = lib.mdDoc ''
+        description = ''
           &lt;width&gt;x&lt;height&gt;[@&lt;rate&gt;[Hz]]
 
           Configures the specified output to use the specified mode.
@@ -47,7 +47,7 @@ let
         type = types.nullOr types.str;
         default = null;
         example = "1600,0";
-        description = lib.mdDoc ''
+        description = ''
           &lt;x&gt;,&lt;y&gt;
 
           Places the output at the specified position in the global coordinates
@@ -59,7 +59,7 @@ let
         type = types.nullOr types.float;
         default = null;
         example = 2;
-        description = lib.mdDoc ''
+        description = ''
           Scales the output by the specified scale factor.
         '';
       };
@@ -76,7 +76,7 @@ let
           "flipped-270"
         ]);
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Sets the output transform.
         '';
       };
@@ -95,7 +95,7 @@ let
       outputs = mkOption {
         type = types.listOf outputModule;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           Outputs configuration.
         '';
       };
@@ -105,7 +105,7 @@ let
         default = [ ];
         example =
           "[ \${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1 ]";
-        description = lib.mdDoc ''
+        description = ''
           Commands executed after the profile is successfully applied.
           Note that if you provide multiple commands, they will be
           executed asynchronously with no guaranteed ordering.
@@ -128,14 +128,14 @@ in {
   meta.maintainers = [ hm.maintainers.nurelin ];
 
   options.services.kanshi = {
-    enable = mkEnableOption (lib.mdDoc
-      "kanshi, a Wayland daemon that automatically configures outputs");
+    enable = mkEnableOption
+      "kanshi, a Wayland daemon that automatically configures outputs";
 
     package = mkOption {
       type = types.package;
       default = pkgs.kanshi;
       defaultText = literalExpression "pkgs.kanshi";
-      description = lib.mdDoc ''
+      description = ''
         kanshi derivation to use.
       '';
     };
@@ -143,7 +143,7 @@ in {
     profiles = mkOption {
       type = types.attrsOf profileModule;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         List of profiles.
       '';
       example = literalExpression ''
@@ -171,7 +171,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration lines to append to the kanshi
         configuration file.
       '';
@@ -180,7 +180,7 @@ in {
     systemdTarget = mkOption {
       type = types.str;
       default = "sway-session.target";
-      description = lib.mdDoc ''
+      description = ''
         Systemd target to bind to.
       '';
     };
diff --git a/modules/services/kbfs.nix b/modules/services/kbfs.nix
index d9cd87e55..a541a32ca 100644
--- a/modules/services/kbfs.nix
+++ b/modules/services/kbfs.nix
@@ -9,12 +9,12 @@ let
 in {
   options = {
     services.kbfs = {
-      enable = mkEnableOption (lib.mdDoc "Keybase File System");
+      enable = mkEnableOption "Keybase File System";
 
       mountPoint = mkOption {
         type = types.str;
         default = "keybase";
-        description = lib.mdDoc ''
+        description = ''
           Mount point for the Keybase filesystem, relative to
           {env}`HOME`.
         '';
@@ -24,7 +24,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "-label kbfs" "-mount-type normal" ];
-        description = lib.mdDoc ''
+        description = ''
           Additional flags to pass to the Keybase filesystem on launch.
         '';
       };
diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix
index 74374557f..0c6aac31e 100644
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@@ -12,13 +12,12 @@ in {
 
   options = {
     services.kdeconnect = {
-      enable = mkEnableOption (lib.mdDoc "KDE connect");
+      enable = mkEnableOption "KDE connect";
 
       indicator = mkOption {
         type = types.bool;
         default = false;
-        description =
-          lib.mdDoc "Whether to enable kdeconnect-indicator service.";
+        description = "Whether to enable kdeconnect-indicator service.";
       };
 
     };
diff --git a/modules/services/keepassx.nix b/modules/services/keepassx.nix
index a4e85eca4..7f8582361 100644
--- a/modules/services/keepassx.nix
+++ b/modules/services/keepassx.nix
@@ -7,7 +7,7 @@ with lib;
 
   options = {
     services.keepassx = {
-      enable = mkEnableOption (lib.mdDoc "the KeePassX password manager");
+      enable = mkEnableOption "the KeePassX password manager";
     };
   };
 
diff --git a/modules/services/keybase.nix b/modules/services/keybase.nix
index 8165fa093..f6e400866 100644
--- a/modules/services/keybase.nix
+++ b/modules/services/keybase.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.keybase;
 
 in {
-  options.services.keybase.enable = mkEnableOption (lib.mdDoc "Keybase");
+  options.services.keybase.enable = mkEnableOption "Keybase";
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/services/keynav.nix b/modules/services/keynav.nix
index 8cef4ae0c..d83252e53 100644
--- a/modules/services/keynav.nix
+++ b/modules/services/keynav.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.keynav;
 
 in {
-  options.services.keynav = { enable = mkEnableOption (lib.mdDoc "keynav"); };
+  options.services.keynav = { enable = mkEnableOption "keynav"; };
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/services/lieer.nix b/modules/services/lieer.nix
index dda6a2302..e5f307616 100644
--- a/modules/services/lieer.nix
+++ b/modules/services/lieer.nix
@@ -52,7 +52,7 @@ in {
   meta.maintainers = [ maintainers.tadfisher ];
 
   options.services.lieer.enable =
-    mkEnableOption (lib.mdDoc "lieer Gmail synchronization service");
+    mkEnableOption "lieer Gmail synchronization service";
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/services/listenbrainz-mpd.nix b/modules/services/listenbrainz-mpd.nix
index cd7fc08b0..0a55a9e46 100644
--- a/modules/services/listenbrainz-mpd.nix
+++ b/modules/services/listenbrainz-mpd.nix
@@ -2,7 +2,7 @@
 
 let
 
-  inherit (lib.options) mkEnableOption mkPackageOptionMD mkOption;
+  inherit (lib.options) mkEnableOption mkPackageOption mkOption;
   inherit (lib.modules) mkIf;
 
   cfg = config.services.listenbrainz-mpd;
@@ -13,14 +13,14 @@ in {
   meta.maintainers = [ lib.maintainers.Scrumplex ];
 
   options.services.listenbrainz-mpd = {
-    enable = mkEnableOption (lib.mdDoc "listenbrainz-mpd");
+    enable = mkEnableOption "listenbrainz-mpd";
 
-    package = mkPackageOptionMD pkgs "listenbrainz-mpd" { };
+    package = mkPackageOption pkgs "listenbrainz-mpd" { };
 
     settings = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         Configuration for listenbrainz-mpd written to
         {file}`$XDG_CONFIG_HOME/listenbrainz-mpd/config.toml`.
       '';
diff --git a/modules/services/lorri.nix b/modules/services/lorri.nix
index 8e94a793e..85b75682f 100644
--- a/modules/services/lorri.nix
+++ b/modules/services/lorri.nix
@@ -10,16 +10,15 @@ in {
   meta.maintainers = [ maintainers.gerschtli ];
 
   options.services.lorri = {
-    enable = mkEnableOption (lib.mdDoc "lorri build daemon");
+    enable = mkEnableOption "lorri build daemon";
 
-    enableNotifications =
-      mkEnableOption (lib.mdDoc "lorri build notifications");
+    enableNotifications = mkEnableOption "lorri build notifications";
 
     package = mkOption {
       type = types.package;
       default = pkgs.lorri;
       defaultText = literalExpression "pkgs.lorri";
-      description = lib.mdDoc "Which lorri package to install.";
+      description = "Which lorri package to install.";
     };
 
     nixPackage = mkOption {
@@ -27,7 +26,7 @@ in {
       default = pkgs.nix;
       defaultText = literalExpression "pkgs.nix";
       example = literalExpression "pkgs.nixVersions.unstable";
-      description = lib.mdDoc "Which nix package to use.";
+      description = "Which nix package to use.";
     };
   };
 
diff --git a/modules/services/mako.nix b/modules/services/mako.nix
index a528d4df8..7ca011782 100644
--- a/modules/services/mako.nix
+++ b/modules/services/mako.nix
@@ -14,21 +14,21 @@ in {
 
   options = {
     services.mako = {
-      enable = mkEnableOption (lib.mdDoc ''
+      enable = mkEnableOption ''
         Mako, lightweight notification daemon for Wayland
-      '');
+      '';
 
       package = mkOption {
         type = types.package;
         default = pkgs.mako;
         defaultText = literalExpression "pkgs.mako";
-        description = lib.mdDoc "The mako package to use.";
+        description = "The mako package to use.";
       };
 
       maxVisible = mkOption {
         default = 5;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set maximum number of visible notifications. Set -1 to show all.
         '';
       };
@@ -37,7 +37,7 @@ in {
         default = "-time";
         type =
           types.nullOr (types.enum [ "+time" "-time" "+priority" "-priority" ]);
-        description = lib.mdDoc ''
+        description = ''
           Sorts incoming notifications by time and/or priority in ascending(+)
           or descending(-) order.
         '';
@@ -46,7 +46,7 @@ in {
       output = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Show notifications on the specified output. If empty, notifications
           will appear on the focused output. Requires the compositor to support
           the Wayland protocol xdg-output-unstable-v1 version 2.
@@ -57,7 +57,7 @@ in {
         default = "top";
         type =
           types.nullOr (types.enum [ "background" "bottom" "top" "overlay" ]);
-        description = lib.mdDoc ''
+        description = ''
           Arrange mako at the specified layer, relative to normal windows.
           Supported values are background, bottom, top, and overlay. Using
           overlay will cause notifications to be displayed above fullscreen
@@ -77,7 +77,7 @@ in {
           "bottom-left"
           "center"
         ]);
-        description = lib.mdDoc ''
+        description = ''
           Show notifications at the specified position on the output.
           Supported values are top-right, top-center, top-left, bottom-right,
           bottom-center, bottom-left, and center.
@@ -87,7 +87,7 @@ in {
       font = mkOption {
         default = "monospace 10";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Font to use, in Pango format.
         '';
       };
@@ -95,7 +95,7 @@ in {
       backgroundColor = mkOption {
         default = "#285577FF";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set popup background color to a specific color, represented in hex
           color code.
         '';
@@ -104,7 +104,7 @@ in {
       textColor = mkOption {
         default = "#FFFFFFFF";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set popup text color to a specific color, represented in hex color
           code.
         '';
@@ -113,7 +113,7 @@ in {
       width = mkOption {
         default = 300;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set width of notification popups in specified number of pixels.
         '';
       };
@@ -121,7 +121,7 @@ in {
       height = mkOption {
         default = 100;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set maximum height of notification popups. Notifications whose text
           takes up less space are shrunk to fit.
         '';
@@ -130,7 +130,7 @@ in {
       margin = mkOption {
         default = "10";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set margin of each edge specified in pixels. Specify single value to
           apply margin on all sides. Two comma-separated values will set
           vertical and horizontal edges separately. Four comma-separated will
@@ -143,7 +143,7 @@ in {
       padding = mkOption {
         default = "5";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set padding of each edge specified in pixels. Specify single value to
           apply margin on all sides. Two comma-separated values will set
           vertical and horizontal edges separately. Four comma-separated will
@@ -156,7 +156,7 @@ in {
       borderSize = mkOption {
         default = 1;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set popup border size to the specified number of pixels.
         '';
       };
@@ -164,7 +164,7 @@ in {
       borderColor = mkOption {
         default = "#4C7899FF";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set popup border color to a specific color, represented in hex color
           code.
         '';
@@ -173,7 +173,7 @@ in {
       borderRadius = mkOption {
         default = 0;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set popup corner radius to the specified number of pixels.
         '';
       };
@@ -181,7 +181,7 @@ in {
       progressColor = mkOption {
         default = "over #5588AAFF";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set popup progress indicator color to a specific color,
           represented in hex color code. To draw the progress
           indicator on top of the background color, use the
@@ -194,7 +194,7 @@ in {
       icons = mkOption {
         default = true;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Whether or not to show icons in notifications.
         '';
       };
@@ -202,7 +202,7 @@ in {
       maxIconSize = mkOption {
         default = 64;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set maximum icon size to the specified number of pixels.
         '';
       };
@@ -210,7 +210,7 @@ in {
       iconPath = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Paths to search for icons when a notification specifies a name
           instead of a full path. Colon-delimited. This approximates the search
           algorithm used by the XDG Icon Theme Specification, but does not
@@ -226,7 +226,7 @@ in {
       markup = mkOption {
         default = true;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           If 1, enable Pango markup. If 0, disable Pango markup. If enabled,
           Pango markup will be interpreted in your format specifier and in the
           body of notifications.
@@ -236,7 +236,7 @@ in {
       actions = mkOption {
         default = true;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Applications may request an action to be associated with activating a
           notification. Disabling this will cause mako to ignore these requests.
         '';
@@ -245,7 +245,7 @@ in {
       format = mkOption {
         default = "<b>%s</b>\\n%b";
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           Set notification format string to format. See FORMAT SPECIFIERS for
           more information. To change this for grouped notifications, set it
           within a grouped criteria.
@@ -255,7 +255,7 @@ in {
       defaultTimeout = mkOption {
         default = 0;
         type = types.nullOr types.int;
-        description = lib.mdDoc ''
+        description = ''
           Set the default timeout to timeout in milliseconds. To disable the
           timeout, set it to zero.
         '';
@@ -264,7 +264,7 @@ in {
       ignoreTimeout = mkOption {
         default = false;
         type = types.nullOr types.bool;
-        description = lib.mdDoc ''
+        description = ''
           If set, mako will ignore the expire timeout sent by notifications
           and use the one provided by default-timeout instead.
         '';
@@ -273,7 +273,7 @@ in {
       groupBy = mkOption {
         default = null;
         type = types.nullOr types.str;
-        description = lib.mdDoc ''
+        description = ''
           A comma-separated list of criteria fields that will be compared to
           other visible notifications to determine if this one should form a
           group with them. All listed criteria must be exactly equal for two
@@ -288,7 +288,7 @@ in {
           [urgency=low]
           border-color=#b8bb26
         '';
-        description = lib.mdDoc "Additional configuration.";
+        description = "Additional configuration.";
       };
     };
   };
diff --git a/modules/services/mbsync.nix b/modules/services/mbsync.nix
index b70f2c09a..7f0f2d305 100644
--- a/modules/services/mbsync.nix
+++ b/modules/services/mbsync.nix
@@ -13,20 +13,20 @@ in {
   meta.maintainers = [ maintainers.pjones ];
 
   options.services.mbsync = {
-    enable = mkEnableOption (lib.mdDoc "mbsync");
+    enable = mkEnableOption "mbsync";
 
     package = mkOption {
       type = types.package;
       default = pkgs.isync;
       defaultText = literalExpression "pkgs.isync";
       example = literalExpression "pkgs.isync";
-      description = lib.mdDoc "The package to use for the mbsync binary.";
+      description = "The package to use for the mbsync binary.";
     };
 
     frequency = mkOption {
       type = types.str;
       default = "*:0/5";
-      description = lib.mdDoc ''
+      description = ''
         How often to run mbsync.  This value is passed to the systemd
         timer configuration as the onCalendar option.  See
         {manpage}`systemd.time(7)`
@@ -37,7 +37,7 @@ in {
     verbose = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether mbsync should produce verbose output.
       '';
     };
@@ -45,7 +45,7 @@ in {
     configFile = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Optional configuration file to link to use instead of
         the default file ({file}`~/.mbsyncrc`).
       '';
@@ -55,7 +55,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "mkdir -p %h/mail";
-      description = lib.mdDoc ''
+      description = ''
         An optional command to run before mbsync executes.  This is
         useful for creating the directories mbsync is going to use.
       '';
@@ -65,7 +65,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "\${pkgs.mu}/bin/mu index";
-      description = lib.mdDoc ''
+      description = ''
         An optional command to run after mbsync executes successfully.
         This is useful for running mailbox indexing tools.
       '';
diff --git a/modules/services/megasync.nix b/modules/services/megasync.nix
index 19b4e2e04..c519ba51f 100644
--- a/modules/services/megasync.nix
+++ b/modules/services/megasync.nix
@@ -11,9 +11,9 @@ in {
 
   options = {
     services.megasync = {
-      enable = mkEnableOption (lib.mdDoc "Megasync client");
+      enable = mkEnableOption "Megasync client";
 
-      package = mkPackageOptionMD pkgs "megasync" { };
+      package = mkPackageOption pkgs "megasync" { };
     };
   };
 
diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix
index ea2b8f4b3..37642a290 100644
--- a/modules/services/mopidy.nix
+++ b/modules/services/mopidy.nix
@@ -52,14 +52,14 @@ in {
   meta.maintainers = [ hm.maintainers.foo-dogsquared ];
 
   options.services.mopidy = {
-    enable = mkEnableOption (lib.mdDoc "Mopidy music player daemon");
+    enable = mkEnableOption "Mopidy music player daemon";
 
     extensionPackages = mkOption {
       type = with types; listOf package;
       default = [ ];
       example = literalExpression
         "with pkgs; [ mopidy-spotify mopidy-mpd mopidy-mpris ]";
-      description = lib.mdDoc ''
+      description = ''
         Mopidy extensions that should be loaded by the service.
       '';
     };
@@ -92,7 +92,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/mopidy/mopidy.conf`.
 
@@ -104,7 +104,7 @@ in {
     extraConfigFiles = mkOption {
       default = [ ];
       type = types.listOf types.path;
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration files read by Mopidy when the service starts.
         Later files in the list override earlier configuration files and
         structured settings.
diff --git a/modules/services/mpd-discord-rpc.nix b/modules/services/mpd-discord-rpc.nix
index e311d0765..8996051a5 100644
--- a/modules/services/mpd-discord-rpc.nix
+++ b/modules/services/mpd-discord-rpc.nix
@@ -10,7 +10,7 @@ in {
   meta.maintainers = [ maintainers.kranzes ];
 
   options.services.mpd-discord-rpc = {
-    enable = mkEnableOption (lib.mdDoc "the mpd-discord-rpc service");
+    enable = mkEnableOption "the mpd-discord-rpc service";
 
     settings = mkOption {
       type = tomlFormat.type;
@@ -24,7 +24,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration included in `config.toml`.
         For available options see <https://github.com/JakeStanger/mpd-discord-rpc#configuration>
       '';
@@ -34,7 +34,7 @@ in {
       type = types.package;
       default = pkgs.mpd-discord-rpc;
       defaultText = literalExpression "pkgs.mpd-discord-rpc";
-      description = lib.mdDoc "mpd-discord-rpc package to use.";
+      description = "mpd-discord-rpc package to use.";
     };
   };
 
diff --git a/modules/services/mpd-mpris.nix b/modules/services/mpd-mpris.nix
index 7207d1394..924036c81 100644
--- a/modules/services/mpd-mpris.nix
+++ b/modules/services/mpd-mpris.nix
@@ -25,16 +25,16 @@ in {
 
   options.services.mpd-mpris = {
     enable = lib.mkEnableOption
-      (lib.mdDoc "mpd-mpris: An implementation of the MPRIS protocol for MPD");
+      "mpd-mpris: An implementation of the MPRIS protocol for MPD";
 
-    package = lib.mkPackageOptionMD pkgs "mpd-mpris" { };
+    package = lib.mkPackageOption pkgs "mpd-mpris" { };
 
     mpd = {
       useLocal = lib.mkOption {
         type = lib.types.bool;
         default = config.services.mpd.enable;
         defaultText = lib.literalExpression "config.services.mpd.enable";
-        description = lib.mdDoc ''
+        description = ''
           Whether to configure for the local MPD daemon. If
           `true` the `network`,
           `host`, and `port`
@@ -45,7 +45,7 @@ in {
       network = lib.mkOption {
         type = with lib.types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The network used to dial to the MPD server. Check
           <https://golang.org/pkg/net/#Dial>
           for available values (most common are "tcp" and "unix")
@@ -56,14 +56,13 @@ in {
         type = with lib.types; nullOr str;
         default = null;
         example = "192.168.1.1";
-        description =
-          lib.mdDoc "The address where MPD is listening for connections.";
+        description = "The address where MPD is listening for connections.";
       };
 
       port = lib.mkOption {
         type = with lib.types; nullOr port;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The port number where MPD is listening for connections.
         '';
       };
@@ -71,7 +70,7 @@ in {
       password = lib.mkOption {
         type = with lib.types; nullOr str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The password to connect to MPD.
         '';
       };
diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix
index ee72b332e..a0011b021 100644
--- a/modules/services/mpd.nix
+++ b/modules/services/mpd.nix
@@ -36,7 +36,7 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable MPD, the music player daemon.
         '';
       };
@@ -45,7 +45,7 @@ in {
         type = types.package;
         default = pkgs.mpd;
         defaultText = "pkgs.mpd";
-        description = lib.mdDoc ''
+        description = ''
           The MPD package to run.
         '';
       };
@@ -58,7 +58,7 @@ in {
           undefined                      otherwise
         '';
         apply = toString; # Prevent copies to Nix store.
-        description = lib.mdDoc ''
+        description = ''
           The directory where mpd reads music from.
 
           If [](#opt-xdg.userDirs.enable) is
@@ -72,7 +72,7 @@ in {
         default = "${cfg.dataDir}/playlists";
         defaultText = "\${dataDir}/playlists";
         apply = toString; # Prevent copies to Nix store.
-        description = lib.mdDoc ''
+        description = ''
           The directory where mpd stores playlists.
         '';
       };
@@ -80,7 +80,7 @@ in {
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Extra directives added to to the end of MPD's configuration
           file, {file}`mpd.conf`. Basic configuration
           like file location and uid/gid is added automatically to the
@@ -93,7 +93,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         example = [ "--verbose" ];
-        description = lib.mdDoc ''
+        description = ''
           Extra command-line arguments to pass to MPD.
         '';
       };
@@ -103,7 +103,7 @@ in {
         default = "${config.xdg.dataHome}/${name}";
         defaultText = "$XDG_DATA_HOME/mpd";
         apply = toString; # Prevent copies to Nix store.
-        description = lib.mdDoc ''
+        description = ''
           The directory where MPD stores its state, tag cache,
           playlists etc.
         '';
@@ -113,7 +113,7 @@ in {
         startWhenNeeded = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             Enable systemd socket activation.
           '';
         };
@@ -122,7 +122,7 @@ in {
           type = types.str;
           default = "127.0.0.1";
           example = "any";
-          description = lib.mdDoc ''
+          description = ''
             The address for the daemon to listen on.
             Use `any` to listen on all addresses.
           '';
@@ -131,7 +131,7 @@ in {
         port = mkOption {
           type = types.port;
           default = 6600;
-          description = lib.mdDoc ''
+          description = ''
             The TCP port on which the the daemon will listen.
           '';
         };
@@ -142,7 +142,7 @@ in {
         type = types.nullOr types.str;
         default = "${cfg.dataDir}/tag_cache";
         defaultText = "\${dataDir}/tag_cache";
-        description = lib.mdDoc ''
+        description = ''
           The path to MPD's database. If set to
           `null` the parameter is omitted from the
           configuration.
diff --git a/modules/services/mpdris2.nix b/modules/services/mpdris2.nix
index 54cfc579c..79f2709fc 100644
--- a/modules/services/mpdris2.nix
+++ b/modules/services/mpdris2.nix
@@ -35,15 +35,15 @@ in {
   meta.maintainers = [ maintainers.pjones ];
 
   options.services.mpdris2 = {
-    enable = mkEnableOption (lib.mdDoc "mpDris2 the MPD to MPRIS2 bridge");
-    notifications = mkEnableOption (lib.mdDoc "song change notifications");
-    multimediaKeys = mkEnableOption (lib.mdDoc "multimedia key support");
+    enable = mkEnableOption "mpDris2 the MPD to MPRIS2 bridge";
+    notifications = mkEnableOption "song change notifications";
+    multimediaKeys = mkEnableOption "multimedia key support";
 
     package = mkOption {
       type = types.package;
       default = pkgs.mpdris2;
       defaultText = literalExpression "pkgs.mpdris2";
-      description = lib.mdDoc "The mpDris2 package to use.";
+      description = "The mpDris2 package to use.";
     };
 
     mpd = {
@@ -52,15 +52,14 @@ in {
         default = config.services.mpd.network.listenAddress;
         defaultText = "config.services.mpd.network.listenAddress";
         example = "192.168.1.1";
-        description =
-          lib.mdDoc "The address where MPD is listening for connections.";
+        description = "The address where MPD is listening for connections.";
       };
 
       port = mkOption {
         type = types.port;
         default = config.services.mpd.network.port;
         defaultText = "config.services.mpd.network.port";
-        description = lib.mdDoc ''
+        description = ''
           The port number where MPD is listening for connections.
         '';
       };
@@ -69,7 +68,7 @@ in {
         type = types.nullOr types.path;
         default = config.services.mpd.musicDirectory;
         defaultText = "config.services.mpd.musicDirectory";
-        description = lib.mdDoc ''
+        description = ''
           If set, mpDris2 will use this directory to access music artwork.
         '';
       };
@@ -77,7 +76,7 @@ in {
       password = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The password to connect to MPD.
         '';
       };
diff --git a/modules/services/mpris-proxy.nix b/modules/services/mpris-proxy.nix
index 3ac455d7f..9996b1376 100644
--- a/modules/services/mpris-proxy.nix
+++ b/modules/services/mpris-proxy.nix
@@ -9,8 +9,8 @@ let
 in {
   meta.maintainers = [ maintainers.thibautmarty ];
 
-  options.services.mpris-proxy.enable = mkEnableOption (lib.mdDoc
-    "a proxy forwarding Bluetooth MIDI controls via MPRIS2 to control media players");
+  options.services.mpris-proxy.enable = mkEnableOption
+    "a proxy forwarding Bluetooth MIDI controls via MPRIS2 to control media players";
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/services/muchsync.nix b/modules/services/muchsync.nix
index 91cda9f91..d4fcd864f 100644
--- a/modules/services/muchsync.nix
+++ b/modules/services/muchsync.nix
@@ -12,7 +12,7 @@ let
       frequency = mkOption {
         type = types.str;
         default = "*:0/5";
-        description = lib.mdDoc ''
+        description = ''
           How often to run {command}`muchsync`. This
           value is passed to the systemd timer configuration as the
           `OnCalendar` option. See
@@ -25,7 +25,7 @@ let
         type = types.str;
         default = "${pkgs.openssh}/bin/ssh -CTaxq";
         defaultText = "ssh -CTaxq";
-        description = lib.mdDoc ''
+        description = ''
           Specifies a command line to pass to {command}`/bin/sh`
           to execute a command on another machine.
 
@@ -37,7 +37,7 @@ let
       upload = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to propagate local changes to the remote.
         '';
       };
@@ -46,7 +46,7 @@ let
         checkForModifiedFiles = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             Check for locally modified files.
             Without this option, muchsync assumes that files in a maildir are
             never edited.
@@ -65,7 +65,7 @@ let
         importNew = mkOption {
           type = types.bool;
           default = true;
-          description = lib.mdDoc ''
+          description = ''
             Whether to begin the synchronisation by running
             {command}`notmuch new` locally.
           '';
@@ -75,7 +75,7 @@ let
       remote = {
         host = mkOption {
           type = types.str;
-          description = lib.mdDoc ''
+          description = ''
             Remote SSH host to synchronize with.
           '';
         };
@@ -84,7 +84,7 @@ let
           type = types.str;
           default = "";
           defaultText = "$PATH/muchsync";
-          description = lib.mdDoc ''
+          description = ''
             Specifies the path to muchsync on the server.
             Ordinarily, muchsync should be in the default PATH on the server
             so this option is not required.
@@ -97,7 +97,7 @@ let
         checkForModifiedFiles = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             Check for modified files on the remote side.
             Without this option, muchsync assumes that files in a maildir are
             never edited.
@@ -116,7 +116,7 @@ let
         importNew = mkOption {
           type = types.bool;
           default = true;
-          description = lib.mdDoc ''
+          description = ''
             Whether to begin the synchronisation by running
             {command}`notmuch new` on the remote side.
           '';
@@ -140,7 +140,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Muchsync remotes to synchronise with.
       '';
     };
diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index d82a6f783..f4abe86e0 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -11,7 +11,7 @@ in {
 
   options = {
     services.network-manager-applet = {
-      enable = mkEnableOption (lib.mdDoc "the Network Manager applet");
+      enable = mkEnableOption "the Network Manager applet";
     };
   };
 
diff --git a/modules/services/nextcloud-client.nix b/modules/services/nextcloud-client.nix
index c004569c4..b436488d1 100644
--- a/modules/services/nextcloud-client.nix
+++ b/modules/services/nextcloud-client.nix
@@ -9,21 +9,20 @@ let
 in {
   options = {
     services.nextcloud-client = {
-      enable = mkEnableOption (lib.mdDoc "Nextcloud Client");
+      enable = mkEnableOption "Nextcloud Client";
 
       package = mkOption {
         type = types.package;
         default = pkgs.nextcloud-client;
         defaultText = literalExpression "pkgs.nextcloud-client";
-        description =
-          lib.mdDoc "The package to use for the nextcloud client binary.";
+        description = "The package to use for the nextcloud client binary.";
       };
 
       startInBackground = mkOption {
         type = types.bool;
         default = false;
         description =
-          lib.mdDoc "Whether to start the Nextcloud client in the background.";
+          "Whether to start the Nextcloud client in the background.";
       };
     };
   };
diff --git a/modules/services/notify-osd.nix b/modules/services/notify-osd.nix
index 38b576909..4faf83643 100644
--- a/modules/services/notify-osd.nix
+++ b/modules/services/notify-osd.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     services.notify-osd = {
-      enable = mkEnableOption (lib.mdDoc "notify-osd");
+      enable = mkEnableOption "notify-osd";
 
       package = mkOption {
         type = types.package;
         default = pkgs.notify-osd;
         defaultText = literalExpression "pkgs.notify-osd";
-        description = lib.mdDoc ''
+        description = ''
           Package containing the {command}`notify-osd` program.
         '';
       };
diff --git a/modules/services/opensnitch-ui.nix b/modules/services/opensnitch-ui.nix
index fcecc7a7f..a086554ca 100644
--- a/modules/services/opensnitch-ui.nix
+++ b/modules/services/opensnitch-ui.nix
@@ -11,9 +11,7 @@ in {
   meta.maintainers = [ maintainers.onny ];
 
   options = {
-    services.opensnitch-ui = {
-      enable = mkEnableOption (lib.mdDoc "Opensnitch client");
-    };
+    services.opensnitch-ui = { enable = mkEnableOption "Opensnitch client"; };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/services/owncloud-client.nix b/modules/services/owncloud-client.nix
index 7f4f9a547..2884affe4 100644
--- a/modules/services/owncloud-client.nix
+++ b/modules/services/owncloud-client.nix
@@ -9,9 +9,9 @@ let
 in {
   options = {
     services.owncloud-client = {
-      enable = mkEnableOption (lib.mdDoc "Owncloud Client");
+      enable = mkEnableOption "Owncloud Client";
 
-      package = mkPackageOptionMD pkgs "owncloud-client" { };
+      package = mkPackageOption pkgs "owncloud-client" { };
     };
   };
 
diff --git a/modules/services/pantalaimon.nix b/modules/services/pantalaimon.nix
index de1e39b08..67fe76cdc 100644
--- a/modules/services/pantalaimon.nix
+++ b/modules/services/pantalaimon.nix
@@ -11,14 +11,14 @@ in {
 
   options = {
     services.pantalaimon = {
-      enable = mkEnableOption (lib.mdDoc
-        "Pantalaimon, an E2EE aware proxy daemon for matrix clients");
+      enable = mkEnableOption
+        "Pantalaimon, an E2EE aware proxy daemon for matrix clients";
 
       package = mkOption {
         type = types.package;
         default = pkgs.pantalaimon;
         defaultText = literalExpression "pkgs.pantalaimon";
-        description = lib.mdDoc
+        description =
           "Package providing the {command}`pantalaimon` executable to use.";
       };
 
@@ -39,7 +39,7 @@ in {
             };
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/pantalaimon/pantalaimon.conf`.
 
diff --git a/modules/services/parcellite.nix b/modules/services/parcellite.nix
index ccec6b440..39b81e869 100644
--- a/modules/services/parcellite.nix
+++ b/modules/services/parcellite.nix
@@ -10,13 +10,13 @@ in {
   meta.maintainers = [ maintainers.gleber ];
 
   options.services.parcellite = {
-    enable = mkEnableOption (lib.mdDoc "Parcellite");
+    enable = mkEnableOption "Parcellite";
 
     extraOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
       example = [ "--no-icon" ];
-      description = lib.mdDoc ''
+      description = ''
         Command line arguments passed to Parcellite.
       '';
     };
@@ -26,7 +26,7 @@ in {
       default = pkgs.parcellite;
       defaultText = literalExpression "pkgs.parcellite";
       example = literalExpression "pkgs.clipit";
-      description = lib.mdDoc "Parcellite derivation to use.";
+      description = "Parcellite derivation to use.";
     };
   };
 
diff --git a/modules/services/pass-secret-service.nix b/modules/services/pass-secret-service.nix
index 5086ae32e..db494337e 100644
--- a/modules/services/pass-secret-service.nix
+++ b/modules/services/pass-secret-service.nix
@@ -10,16 +10,16 @@ in {
   meta.maintainers = with maintainers; [ cab404 cyntheticfox ];
 
   options.services.pass-secret-service = {
-    enable = mkEnableOption (lib.mdDoc "Pass libsecret service");
+    enable = mkEnableOption "Pass libsecret service";
 
-    package = mkPackageOptionMD pkgs "pass-secret-service" { };
+    package = mkPackageOption pkgs "pass-secret-service" { };
 
     storePath = mkOption {
       type = with types; nullOr str;
       default = null;
       defaultText = "$HOME/.password-store";
       example = "/home/user/.local/share/password-store";
-      description = lib.mdDoc ''
+      description = ''
         Absolute path to password store. Defaults to
         {file}`$HOME/.password-store` if the
         {option}`programs.password-store` module is not enabled, and
diff --git a/modules/services/password-store-sync.nix b/modules/services/password-store-sync.nix
index fd7ddee1e..dfff410f2 100644
--- a/modules/services/password-store-sync.nix
+++ b/modules/services/password-store-sync.nix
@@ -11,12 +11,12 @@ in {
   meta.maintainers = with maintainers; [ pacien ];
 
   options.services.password-store-sync = {
-    enable = mkEnableOption (lib.mdDoc "Password store periodic sync");
+    enable = mkEnableOption "Password store periodic sync";
 
     frequency = mkOption {
       type = types.str;
       default = "*:0/5";
-      description = lib.mdDoc ''
+      description = ''
         How often to synchronise the password store git repository with its
         default upstream.
 
diff --git a/modules/services/pasystray.nix b/modules/services/pasystray.nix
index e33891b80..32922ad0f 100644
--- a/modules/services/pasystray.nix
+++ b/modules/services/pasystray.nix
@@ -6,9 +6,7 @@ with lib;
   meta.maintainers = [ hm.maintainers.pltanton ];
 
   options = {
-    services.pasystray = {
-      enable = mkEnableOption (lib.mdDoc "PulseAudio system tray");
-    };
+    services.pasystray = { enable = mkEnableOption "PulseAudio system tray"; };
   };
 
   config = mkIf config.services.pasystray.enable {
diff --git a/modules/services/pbgopy.nix b/modules/services/pbgopy.nix
index d0ea6d20e..fecc64ca0 100644
--- a/modules/services/pbgopy.nix
+++ b/modules/services/pbgopy.nix
@@ -18,13 +18,13 @@ in {
   meta.maintainers = [ maintainers.ivar ];
 
   options.services.pbgopy = {
-    enable = mkEnableOption (lib.mdDoc "pbgopy");
+    enable = mkEnableOption "pbgopy";
 
     port = mkOption {
       type = types.port;
       default = 9090;
       example = 8080;
-      description = lib.mdDoc ''
+      description = ''
         The port to host the pbgopy server on.
       '';
     };
@@ -33,7 +33,7 @@ in {
       type = types.str;
       default = "24h";
       example = "10m";
-      description = lib.mdDoc ''
+      description = ''
         The TTL for the cache. Use `"0s"` to disable it.
       '';
     };
@@ -42,7 +42,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "user:pass";
-      description = lib.mdDoc ''
+      description = ''
         Basic HTTP authentication's username and password. Both the username and
         password are escaped.
       '';
diff --git a/modules/services/picom.nix b/modules/services/picom.nix
index 485d30319..e13688096 100644
--- a/modules/services/picom.nix
+++ b/modules/services/picom.nix
@@ -66,12 +66,12 @@ in {
   ];
 
   options.services.picom = {
-    enable = mkEnableOption (lib.mdDoc "Picom X11 compositor");
+    enable = mkEnableOption "Picom X11 compositor";
 
     fade = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Fade windows in and out.
       '';
     };
@@ -80,7 +80,7 @@ in {
       type = types.ints.positive;
       default = 10;
       example = 5;
-      description = lib.mdDoc ''
+      description = ''
         Time between fade animation step (in ms).
       '';
     };
@@ -89,7 +89,7 @@ in {
       type = pairOf (types.numbers.between 1.0e-2 1);
       default = [ 2.8e-2 3.0e-2 ];
       example = [ 4.0e-2 4.0e-2 ];
-      description = lib.mdDoc ''
+      description = ''
         Opacity change between fade steps (in and out).
       '';
     };
@@ -98,7 +98,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "window_type *= 'menu'" "name ~= 'Firefox$'" "focused = 1" ];
-      description = lib.mdDoc ''
+      description = ''
         List of conditions of windows that should not be faded.
         See `picom(1)` man page for more examples.
       '';
@@ -107,7 +107,7 @@ in {
     shadow = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Draw window shadows.
       '';
     };
@@ -116,7 +116,7 @@ in {
       type = pairOf types.int;
       default = [ (-15) (-15) ];
       example = [ (-10) (-15) ];
-      description = lib.mdDoc ''
+      description = ''
         Left and right offset for shadows (in pixels).
       '';
     };
@@ -125,7 +125,7 @@ in {
       type = types.numbers.between 0 1;
       default = 0.75;
       example = 0.8;
-      description = lib.mdDoc ''
+      description = ''
         Window shadows opacity.
       '';
     };
@@ -134,7 +134,7 @@ in {
       type = types.listOf types.str;
       default = [ ];
       example = [ "window_type *= 'menu'" "name ~= 'Firefox$'" "focused = 1" ];
-      description = lib.mdDoc ''
+      description = ''
         List of conditions of windows that should have no shadow.
         See `picom(1)` man page for more examples.
       '';
@@ -144,7 +144,7 @@ in {
       type = types.numbers.between 0 1;
       default = 1.0;
       example = 0.8;
-      description = lib.mdDoc ''
+      description = ''
         Opacity of active windows.
       '';
     };
@@ -153,7 +153,7 @@ in {
       type = types.numbers.between 0.1 1;
       default = 1.0;
       example = 0.8;
-      description = lib.mdDoc ''
+      description = ''
         Opacity of inactive windows.
       '';
     };
@@ -162,7 +162,7 @@ in {
       type = types.numbers.between 0 1;
       default = 1.0;
       example = 0.8;
-      description = lib.mdDoc ''
+      description = ''
         Opacity of dropdown and popup menu.
       '';
     };
@@ -180,7 +180,7 @@ in {
         }
       '';
       example = { };
-      description = lib.mdDoc ''
+      description = ''
         Rules for specific window types.
       '';
     };
@@ -192,7 +192,7 @@ in {
         "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a"
         "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
       ];
-      description = lib.mdDoc ''
+      description = ''
         Rules that control the opacity of windows, in format PERCENT:PATTERN.
       '';
     };
@@ -200,7 +200,7 @@ in {
     backend = mkOption {
       type = types.enum [ "egl" "glx" "xrender" "xr_glx_hybrid" ];
       default = "xrender";
-      description = lib.mdDoc ''
+      description = ''
         Backend to use: `egl`, `glx`, `xrender` or `xr_glx_hybrid`.
       '';
     };
@@ -208,7 +208,7 @@ in {
     vSync = mkOption {
       type = types.bool;
       default = false;
-      description = lib.mdDoc ''
+      description = ''
         Enable vertical synchronization.
       '';
     };
@@ -217,7 +217,7 @@ in {
       type = with types; listOf str;
       default = [ ];
       example = literalExpression ''[ "--legacy-backends" ]'';
-      description = lib.mdDoc ''
+      description = ''
         Extra arguments to be passed to the picom executable.
       '';
     };
@@ -227,7 +227,7 @@ in {
       default = pkgs.picom;
       defaultText = literalExpression "pkgs.picom";
       example = literalExpression "pkgs.picom";
-      description = lib.mdDoc ''
+      description = ''
         Picom derivation to use.
       '';
     };
@@ -261,7 +261,7 @@ in {
               deviation = 5.0;
             };
         '';
-        description = lib.mdDoc ''
+        description = ''
           Picom settings. Use this option to configure Picom settings not exposed
           in a NixOS option or to bypass one. For the available options see the
           CONFIGURATION FILES section at `picom(1)`.
diff --git a/modules/services/plan9port.nix b/modules/services/plan9port.nix
index 47ed8c27b..249804724 100644
--- a/modules/services/plan9port.nix
+++ b/modules/services/plan9port.nix
@@ -11,9 +11,9 @@ in {
 
   options.services.plan9port = {
     fontsrv.enable =
-      mkEnableOption (lib.mdDoc "the Plan 9 file system access to host fonts");
-    plumber.enable = mkEnableOption
-      (lib.mdDoc "the Plan 9 file system for interprocess messaging");
+      mkEnableOption "the Plan 9 file system access to host fonts";
+    plumber.enable =
+      mkEnableOption "the Plan 9 file system for interprocess messaging";
   };
 
   config = mkIf (cfg.fontsrv.enable || cfg.plumber.enable) {
diff --git a/modules/services/playerctld.nix b/modules/services/playerctld.nix
index 6d168406e..5fed8f2b4 100644
--- a/modules/services/playerctld.nix
+++ b/modules/services/playerctld.nix
@@ -10,13 +10,13 @@ in {
   meta.maintainers = [ hm.maintainers.fendse ];
 
   options.services.playerctld = {
-    enable = mkEnableOption (lib.mdDoc "playerctld daemon");
+    enable = mkEnableOption "playerctld daemon";
 
     package = mkOption {
       type = types.package;
       default = pkgs.playerctl;
       defaultText = literalExpression "pkgs.playerctl";
-      description = lib.mdDoc "The playerctl package to use.";
+      description = "The playerctl package to use.";
     };
   };
 
diff --git a/modules/services/plex-mpv-shim.nix b/modules/services/plex-mpv-shim.nix
index 9c43703a4..940e57184 100644
--- a/modules/services/plex-mpv-shim.nix
+++ b/modules/services/plex-mpv-shim.nix
@@ -12,13 +12,13 @@ in {
 
   options = {
     services.plex-mpv-shim = {
-      enable = mkEnableOption (lib.mdDoc "Plex mpv shim");
+      enable = mkEnableOption "Plex mpv shim";
 
       package = mkOption {
         type = types.package;
         default = pkgs.plex-mpv-shim;
         defaultText = literalExpression "pkgs.plex-mpv-shim";
-        description = lib.mdDoc "The package to use for the Plex mpv shim.";
+        description = "The package to use for the Plex mpv shim.";
       };
 
       settings = mkOption {
@@ -35,7 +35,7 @@ in {
             auto_transcode = true;
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/plex-mpv-shim/config.json`. See
           <https://github.com/iwalton3/plex-mpv-shim/blob/master/README.md>
diff --git a/modules/services/polybar.nix b/modules/services/polybar.nix
index 866cf1849..fbcecc5af 100644
--- a/modules/services/polybar.nix
+++ b/modules/services/polybar.nix
@@ -70,13 +70,13 @@ let
 in {
   options = {
     services.polybar = {
-      enable = mkEnableOption (lib.mdDoc "Polybar status bar");
+      enable = mkEnableOption "Polybar status bar";
 
       package = mkOption {
         type = types.package;
         default = pkgs.polybar;
         defaultText = literalExpression "pkgs.polybar";
-        description = lib.mdDoc "Polybar package to install.";
+        description = "Polybar package to install.";
         example = literalExpression ''
           pkgs.polybar.override {
             i3GapsSupport = true;
@@ -91,7 +91,7 @@ in {
         type = types.coercedTo types.path
           (p: { "section/base" = { include-file = "${p}"; }; })
           (types.attrsOf (types.attrsOf eitherStrBoolIntList));
-        description = lib.mdDoc ''
+        description = ''
           Polybar configuration. Can be either path to a file, or set of attributes
           that will be used to create the final configuration.
           See also {option}`services.polybar.settings` for a more nix-friendly format.
@@ -122,7 +122,7 @@ in {
         type = with types;
           let ty = oneOf [ bool int float str (listOf ty) (attrsOf ty) ];
           in attrsOf (attrsOf ty // { description = "attribute sets"; });
-        description = lib.mdDoc ''
+        description = ''
           Polybar configuration. This takes a nix attrset and converts it to the
           strange data format that polybar uses.
           Each entry will be converted to a section in the output file.
@@ -172,7 +172,7 @@ in {
 
       extraConfig = mkOption {
         type = types.lines;
-        description = lib.mdDoc "Additional configuration to add.";
+        description = "Additional configuration to add.";
         default = "";
         example = ''
           [module/date]
@@ -187,7 +187,7 @@ in {
 
       script = mkOption {
         type = types.lines;
-        description = lib.mdDoc ''
+        description = ''
           This script will be used to start the polybars.
           Set all necessary environment variables here and start all bars.
           It can be assumed that {command}`polybar` executable is in the {env}`PATH`.
diff --git a/modules/services/poweralertd.nix b/modules/services/poweralertd.nix
index d25767864..bc02dead3 100644
--- a/modules/services/poweralertd.nix
+++ b/modules/services/poweralertd.nix
@@ -8,7 +8,7 @@ in {
   meta.maintainers = [ maintainers.thibautmarty ];
 
   options.services.poweralertd.enable =
-    mkEnableOption (lib.mdDoc "the Upower-powered power alertd");
+    mkEnableOption "the Upower-powered power alertd";
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/services/pueue.nix b/modules/services/pueue.nix
index 87f190c34..1431c1cd7 100644
--- a/modules/services/pueue.nix
+++ b/modules/services/pueue.nix
@@ -12,10 +12,9 @@ in {
   meta.maintainers = [ maintainers.AndersonTorres ];
 
   options.services.pueue = {
-    enable =
-      mkEnableOption (lib.mdDoc "Pueue, CLI process scheduler and manager");
+    enable = mkEnableOption "Pueue, CLI process scheduler and manager";
 
-    package = mkPackageOptionMD pkgs "pueue" { };
+    package = mkPackageOption pkgs "pueue" { };
 
     settings = mkOption {
       type = yamlFormat.type;
@@ -27,7 +26,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Configuration written to
         {file}`$XDG_CONFIG_HOME/pueue/pueue.yml`.
       '';
diff --git a/modules/services/pulseeffects.nix b/modules/services/pulseeffects.nix
index a1a6a0cf6..434adf85e 100644
--- a/modules/services/pulseeffects.nix
+++ b/modules/services/pulseeffects.nix
@@ -12,25 +12,25 @@ in {
   meta.maintainers = [ maintainers.jonringer ];
 
   options.services.pulseeffects = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       Pulseeffects daemon
       Note, it is necessary to add
       ```nix
       programs.dconf.enable = true;
       ```
-      to your system configuration for the daemon to work correctly'');
+      to your system configuration for the daemon to work correctly'';
 
     package = mkOption {
       type = types.package;
       default = pkgs.pulseeffects-legacy;
       defaultText = literalExpression "pkgs.pulseeffects-legacy";
-      description = lib.mdDoc "Pulseeffects package to use.";
+      description = "Pulseeffects package to use.";
     };
 
     preset = mkOption {
       type = types.str;
       default = "";
-      description = lib.mdDoc ''
+      description = ''
         Which preset to use when starting pulseeffects.
         Will likely need to launch pulseeffects to initially create preset.
       '';
diff --git a/modules/services/random-background.nix b/modules/services/random-background.nix
index d8b479e1c..7e887f32e 100644
--- a/modules/services/random-background.nix
+++ b/modules/services/random-background.nix
@@ -15,8 +15,8 @@ in {
 
   options = {
     services.random-background = {
-      enable = mkEnableOption (lib.mdDoc "") // {
-        description = lib.mdDoc ''
+      enable = mkEnableOption "" // {
+        description = ''
           Whether to enable random desktop background.
 
           Note, if you are using NixOS and have set up a custom
@@ -30,7 +30,7 @@ in {
       imageDirectory = mkOption {
         type = types.str;
         example = "%h/backgrounds";
-        description = lib.mdDoc ''
+        description = ''
           The directory of images from which a background should be
           chosen. Should be formatted in a way understood by systemd,
           e.g., '%h' is the home directory.
@@ -40,15 +40,14 @@ in {
       display = mkOption {
         type = types.enum [ "center" "fill" "max" "scale" "tile" ];
         default = "fill";
-        description =
-          lib.mdDoc "Display background images according to this option.";
+        description = "Display background images according to this option.";
       };
 
       interval = mkOption {
         default = null;
         type = types.nullOr types.str;
         example = "1h";
-        description = lib.mdDoc ''
+        description = ''
           The duration between changing background image, set to null
           to only set background when logging in. Should be formatted
           as a duration understood by systemd.
@@ -58,7 +57,7 @@ in {
       enableXinerama = mkOption {
         default = true;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Will place a separate image per screen when enabled,
           otherwise a single image will be stretched across all
           screens.
diff --git a/modules/services/recoll.nix b/modules/services/recoll.nix
index 6224fa676..e4159d284 100644
--- a/modules/services/recoll.nix
+++ b/modules/services/recoll.nix
@@ -78,13 +78,13 @@ in {
   meta.maintainers = [ maintainers.foo-dogsquared ];
 
   options.services.recoll = {
-    enable = mkEnableOption (lib.mdDoc "Recoll file index service");
+    enable = mkEnableOption "Recoll file index service";
 
     package = mkOption {
       type = types.package;
       default = pkgs.recoll;
       defaultText = literalExpression "pkgs.recoll";
-      description = lib.mdDoc ''
+      description = ''
         Package providing the `recoll` binary.
       '';
       example = literalExpression "(pkgs.recoll.override { withGui = false; })";
@@ -94,7 +94,7 @@ in {
       type = types.str;
       default = "hourly";
       example = "00/2:00";
-      description = lib.mdDoc ''
+      description = ''
         When or how often the periodic update should run. Must be the format
         described from
         {manpage}`systemd.time(7)`.
@@ -104,7 +104,7 @@ in {
     settings = mkOption {
       type = settingsFormat.type;
       default = { };
-      description = lib.mdDoc ''
+      description = ''
         The configuration to be written at
         {file}`''${config.services.recoll.configDir}/recoll.conf`.
 
@@ -133,7 +133,7 @@ in {
       default = "${config.home.homeDirectory}/.recoll";
       defaultText = literalExpression "\${config.home.homeDirectory}/.recoll";
       example = literalExpression "\${config.xdg.configHome}/recoll";
-      description = lib.mdDoc ''
+      description = ''
         The directory to contain Recoll configuration files. This will be set
         as `RECOLL_CONFDIR`.
       '';
diff --git a/modules/services/redshift-gammastep/lib/options.nix b/modules/services/redshift-gammastep/lib/options.nix
index bbdbe25b0..81347e643 100644
--- a/modules/services/redshift-gammastep/lib/options.nix
+++ b/modules/services/redshift-gammastep/lib/options.nix
@@ -29,13 +29,13 @@ in {
   ];
 
   options = {
-    enable = mkEnableOption (lib.mdDoc programName);
+    enable = mkEnableOption programName;
 
     dawnTime = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "6:00-7:45";
-      description = lib.mdDoc ''
+      description = ''
         Set the time interval of dawn manually.
         The times must be specified as HH:MM in 24-hour format.
       '';
@@ -45,7 +45,7 @@ in {
       type = types.nullOr types.str;
       default = null;
       example = "18:35-20:15";
-      description = lib.mdDoc ''
+      description = ''
         Set the time interval of dusk manually.
         The times must be specified as HH:MM in 24-hour format.
       '';
@@ -54,7 +54,7 @@ in {
     latitude = mkOption {
       type = with types; nullOr (either str float);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Your current latitude, between `-90.0` and
         `90.0`. Must be provided along with
         longitude.
@@ -64,7 +64,7 @@ in {
     longitude = mkOption {
       type = with types; nullOr (either str float);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Your current longitude, between `-180.0` and
         `180.0`. Must be provided along with
         latitude.
@@ -74,7 +74,7 @@ in {
     provider = mkOption {
       type = types.enum [ "manual" "geoclue2" ];
       default = "manual";
-      description = lib.mdDoc ''
+      description = ''
         The location provider to use for determining your location. If set to
         `manual` you must also provide latitude/longitude.
         If set to `geoclue2`, you must also enable the global
@@ -86,7 +86,7 @@ in {
       day = mkOption {
         type = types.int;
         default = 5500;
-        description = lib.mdDoc ''
+        description = ''
           Colour temperature to use during the day, between
           `1000` and `25000` K.
         '';
@@ -94,7 +94,7 @@ in {
       night = mkOption {
         type = types.int;
         default = 3700;
-        description = lib.mdDoc ''
+        description = ''
           Colour temperature to use at night, between
           `1000` and `25000` K.
         '';
@@ -105,18 +105,18 @@ in {
       type = types.package;
       default = defaultPackage;
       defaultText = literalExpression examplePackage;
-      description = lib.mdDoc ''
+      description = ''
         ${programName} derivation to use.
       '';
     };
 
-    enableVerboseLogging = mkEnableOption (lib.mdDoc "verbose service logging");
+    enableVerboseLogging = mkEnableOption "verbose service logging";
 
     tray = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc ''
+      description = ''
         Start the ${appletExecutable} tray applet.
       '';
     };
@@ -134,7 +134,7 @@ in {
           };
         };
       '';
-      description = lib.mdDoc ''
+      description = ''
         The configuration to pass to ${programName}.
         Available options for ${programName} described in
         {manpage}`${moduleName}(1)`.
diff --git a/modules/services/rsibreak.nix b/modules/services/rsibreak.nix
index 7040b4a0c..351632a02 100644
--- a/modules/services/rsibreak.nix
+++ b/modules/services/rsibreak.nix
@@ -9,7 +9,7 @@ let
 in {
   options.services.rsibreak = {
 
-    enable = mkEnableOption (lib.mdDoc "rsibreak");
+    enable = mkEnableOption "rsibreak";
 
   };
 
diff --git a/modules/services/safeeyes.nix b/modules/services/safeeyes.nix
index 048123577..156624691 100644
--- a/modules/services/safeeyes.nix
+++ b/modules/services/safeeyes.nix
@@ -11,9 +11,9 @@ in {
 
   options = {
     services.safeeyes = {
-      enable = mkEnableOption (lib.mdDoc "The Safe Eyes OSGI service");
+      enable = mkEnableOption "The Safe Eyes OSGI service";
 
-      package = mkPackageOptionMD pkgs "safeeyes" { };
+      package = mkPackageOption pkgs "safeeyes" { };
     };
   };
 
diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index 56279f0d5..085573f8a 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -23,18 +23,18 @@ in {
   ];
 
   options.services.screen-locker = {
-    enable = mkEnableOption (lib.mdDoc "screen locker for X session");
+    enable = mkEnableOption "screen locker for X session";
 
     lockCmd = mkOption {
       type = types.str;
-      description = lib.mdDoc "Locker command to run.";
+      description = "Locker command to run.";
       example = "\${pkgs.i3lock}/bin/i3lock -n -c 000000";
     };
 
     inactiveInterval = mkOption {
       type = types.int;
       default = 10;
-      description = lib.mdDoc ''
+      description = ''
         Inactive time interval in minutes after which session will be locked.
         The minimum is 1 minute, and the maximum is 1 hour.
         If {option}`xautolock.enable` is true, it will use this setting.
@@ -48,13 +48,13 @@ in {
       enable = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Use xautolock for time-based locking.";
+        description = "Use xautolock for time-based locking.";
       };
 
       package = mkOption {
         type = types.package;
         default = pkgs.xautolock;
-        description = lib.mdDoc ''
+        description = ''
           Package providing the {command}`xautolock` binary.
         '';
       };
@@ -62,7 +62,7 @@ in {
       detectSleep = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to reset xautolock timers when awaking from sleep.
           No effect if {option}`xautolock.enable` is false.
         '';
@@ -71,7 +71,7 @@ in {
       extraOptions = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           Extra command-line arguments to pass to {command}`xautolock`.
           No effect if {option}`xautolock.enable` is false.
         '';
@@ -82,7 +82,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.xss-lock;
-        description = lib.mdDoc ''
+        description = ''
           Package providing the {command}`xss-lock` binary.
         '';
       };
@@ -90,7 +90,7 @@ in {
       extraOptions = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           Extra command-line arguments to pass to {command}`xss-lock`.
         '';
       };
@@ -98,7 +98,7 @@ in {
       screensaverCycle = mkOption {
         type = types.int;
         default = 600;
-        description = lib.mdDoc ''
+        description = ''
           The X server's screensaver cycle value expressed as seconds.
           This will be used with {command}`xset` to configure
           the cycle along with timeout.
diff --git a/modules/services/sctd.nix b/modules/services/sctd.nix
index 8bb77a032..44c770264 100644
--- a/modules/services/sctd.nix
+++ b/modules/services/sctd.nix
@@ -7,12 +7,12 @@ with lib;
 
   options = {
     services.sctd = {
-      enable = mkEnableOption (lib.mdDoc "sctd");
+      enable = mkEnableOption "sctd";
 
       baseTemperature = mkOption {
         type = types.ints.between 2500 9000;
         default = 4500;
-        description = lib.mdDoc ''
+        description = ''
           The base color temperature used by sctd, which should be between 2500 and 9000.
           See
           {manpage}`sctd(1)`
diff --git a/modules/services/spotifyd.nix b/modules/services/spotifyd.nix
index 702f4a265..dfe611fd7 100644
--- a/modules/services/spotifyd.nix
+++ b/modules/services/spotifyd.nix
@@ -12,7 +12,7 @@ let
 
 in {
   options.services.spotifyd = {
-    enable = mkEnableOption (lib.mdDoc "SpotifyD connect");
+    enable = mkEnableOption "SpotifyD connect";
 
     package = mkOption {
       type = types.package;
@@ -20,7 +20,7 @@ in {
       defaultText = literalExpression "pkgs.spotifyd";
       example =
         literalExpression "(pkgs.spotifyd.override { withKeyring = true; })";
-      description = lib.mdDoc ''
+      description = ''
         The `spotifyd` package to use.
         Can be used to specify extensions.
       '';
@@ -29,7 +29,7 @@ in {
     settings = mkOption {
       type = tomlFormat.type;
       default = { };
-      description = lib.mdDoc "Configuration for spotifyd";
+      description = "Configuration for spotifyd";
       example = literalExpression ''
         {
           global = {
diff --git a/modules/services/ssh-agent.nix b/modules/services/ssh-agent.nix
index 02cf2c590..16db3232c 100644
--- a/modules/services/ssh-agent.nix
+++ b/modules/services/ssh-agent.nix
@@ -9,7 +9,7 @@ in {
 
   options = {
     services.ssh-agent = {
-      enable = lib.mkEnableOption (lib.mdDoc "OpenSSH private key agent");
+      enable = lib.mkEnableOption "OpenSSH private key agent";
     };
   };
 
diff --git a/modules/services/stalonetray.nix b/modules/services/stalonetray.nix
index 4d34d9ae6..172d6dd9d 100644
--- a/modules/services/stalonetray.nix
+++ b/modules/services/stalonetray.nix
@@ -9,20 +9,19 @@ let
 in {
   options = {
     services.stalonetray = {
-      enable = mkEnableOption (lib.mdDoc "Stalonetray system tray");
+      enable = mkEnableOption "Stalonetray system tray";
 
       package = mkOption {
         default = pkgs.stalonetray;
         defaultText = literalExpression "pkgs.stalonetray";
         type = types.package;
         example = literalExpression "pkgs.stalonetray";
-        description =
-          lib.mdDoc "The package to use for the Stalonetray binary.";
+        description = "The package to use for the Stalonetray binary.";
       };
 
       config = mkOption {
         type = with types; attrsOf (nullOr (either str (either bool int)));
-        description = lib.mdDoc ''
+        description = ''
           Stalonetray configuration as a set of attributes.
         '';
         default = { };
@@ -37,8 +36,7 @@ in {
 
       extraConfig = mkOption {
         type = types.lines;
-        description =
-          lib.mdDoc "Additional configuration lines for stalonetrayrc.";
+        description = "Additional configuration lines for stalonetrayrc.";
         default = "";
         example = ''
           geometry 3x1-600+0
diff --git a/modules/services/status-notifier-watcher.nix b/modules/services/status-notifier-watcher.nix
index b510eeecf..c6fe08da6 100644
--- a/modules/services/status-notifier-watcher.nix
+++ b/modules/services/status-notifier-watcher.nix
@@ -11,7 +11,7 @@ in {
 
   options = {
     services.status-notifier-watcher = {
-      enable = mkEnableOption (lib.mdDoc "Status Notifier Watcher");
+      enable = mkEnableOption "Status Notifier Watcher";
 
       package = mkOption {
         default = pkgs.haskellPackages.status-notifier-item;
@@ -19,7 +19,7 @@ in {
           literalExpression "pkgs.haskellPackages.status-notifier-item";
         type = types.package;
         example = literalExpression "pkgs.haskellPackages.status-notifier-item";
-        description = lib.mdDoc
+        description =
           "The package to use for the status notifier watcher binary.";
       };
     };
diff --git a/modules/services/swayidle.nix b/modules/services/swayidle.nix
index a5e11dd55..6e8b55cb8 100644
--- a/modules/services/swayidle.nix
+++ b/modules/services/swayidle.nix
@@ -28,20 +28,18 @@ in {
         timeout = mkOption {
           type = types.ints.positive;
           example = 60;
-          description = lib.mdDoc "Timeout in seconds.";
+          description = "Timeout in seconds.";
         };
 
         command = mkOption {
           type = types.str;
-          description =
-            lib.mdDoc "Command to run after timeout seconds of inactivity.";
+          description = "Command to run after timeout seconds of inactivity.";
         };
 
         resumeCommand = mkOption {
           type = with types; nullOr str;
           default = null;
-          description =
-            lib.mdDoc "Command to run when there is activity again.";
+          description = "Command to run when there is activity again.";
         };
       };
     };
@@ -50,24 +48,24 @@ in {
       options = {
         event = mkOption {
           type = types.enum [ "before-sleep" "after-resume" "lock" "unlock" ];
-          description = lib.mdDoc "Event name.";
+          description = "Event name.";
         };
 
         command = mkOption {
           type = types.str;
-          description = lib.mdDoc "Command to run when event occurs.";
+          description = "Command to run when event occurs.";
         };
       };
     };
 
   in {
-    enable = mkEnableOption (lib.mdDoc "idle manager for Wayland");
+    enable = mkEnableOption "idle manager for Wayland";
 
     package = mkOption {
       type = types.package;
       default = pkgs.swayidle;
       defaultText = literalExpression "pkgs.swayidle";
-      description = lib.mdDoc "Swayidle package to install.";
+      description = "Swayidle package to install.";
     };
 
     timeouts = mkOption {
@@ -78,7 +76,7 @@ in {
           { timeout = 60; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
         ]
       '';
-      description = lib.mdDoc "List of commands to run after idle timeout.";
+      description = "List of commands to run after idle timeout.";
     };
 
     events = mkOption {
@@ -90,19 +88,19 @@ in {
           { event = "lock"; command = "lock"; }
         ]
       '';
-      description = lib.mdDoc "Run command on occurrence of a event.";
+      description = "Run command on occurrence of a event.";
     };
 
     extraArgs = mkOption {
       type = with types; listOf str;
       default = [ ];
-      description = lib.mdDoc "Extra arguments to pass to swayidle.";
+      description = "Extra arguments to pass to swayidle.";
     };
 
     systemdTarget = mkOption {
       type = types.str;
       default = "sway-session.target";
-      description = lib.mdDoc ''
+      description = ''
         Systemd target to bind to.
       '';
     };
diff --git a/modules/services/swayosd.nix b/modules/services/swayosd.nix
index 737497dea..067c104c3 100644
--- a/modules/services/swayosd.nix
+++ b/modules/services/swayosd.nix
@@ -10,9 +10,9 @@ in {
   meta.maintainers = [ hm.maintainers.pltanton ];
 
   options.services.swayosd = {
-    enable = mkEnableOption (lib.mdDoc ''
+    enable = mkEnableOption ''
       swayosd, a GTK based on screen display for keyboard shortcuts like
-      caps-lock and volume'');
+      caps-lock and volume'';
 
     package = mkPackageOption pkgs "swayosd" { };
 
@@ -20,7 +20,7 @@ in {
       type = types.nullOr types.ints.unsigned;
       default = null;
       example = 120;
-      description = lib.mdDoc ''
+      description = ''
         Sets the maximum volume.
       '';
     };
diff --git a/modules/services/sxhkd.nix b/modules/services/sxhkd.nix
index 966306f38..e955d00b1 100644
--- a/modules/services/sxhkd.nix
+++ b/modules/services/sxhkd.nix
@@ -19,21 +19,19 @@ in {
   ];
 
   options.services.sxhkd = {
-    enable = mkEnableOption (lib.mdDoc "simple X hotkey daemon");
+    enable = mkEnableOption "simple X hotkey daemon";
 
     package = mkOption {
       type = types.package;
       default = pkgs.sxhkd;
       defaultText = "pkgs.sxhkd";
-      description =
-        lib.mdDoc "Package containing the {command}`sxhkd` executable.";
+      description = "Package containing the {command}`sxhkd` executable.";
     };
 
     extraOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description =
-        lib.mdDoc "Command line arguments to invoke {command}`sxhkd` with.";
+      description = "Command line arguments to invoke {command}`sxhkd` with.";
       example = literalExpression ''[ "-m 1" ]'';
     };
 
@@ -41,8 +39,7 @@ in {
       type =
         types.attrsOf (types.nullOr (types.oneOf [ types.str types.path ]));
       default = { };
-      description =
-        lib.mdDoc "An attribute set that assigns hotkeys to commands.";
+      description = "An attribute set that assigns hotkeys to commands.";
       example = literalExpression ''
         {
           "super + shift + {r,c}" = "i3-msg {restart,reload}";
@@ -55,7 +52,7 @@ in {
     extraConfig = mkOption {
       default = "";
       type = types.lines;
-      description = lib.mdDoc "Additional configuration to add.";
+      description = "Additional configuration to add.";
       example = literalExpression ''
         super + {_,shift +} {1-9,0}
           i3-msg {workspace,move container to workspace} {1-10}
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 8dbe2c778..b6cebfa5f 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -20,14 +20,13 @@ in {
 
   options = {
     services.syncthing = {
-      enable =
-        mkEnableOption (lib.mdDoc "Syncthing continuous file synchronization");
+      enable = mkEnableOption "Syncthing continuous file synchronization";
 
       extraOptions = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "--gui-apikey=apiKey" ];
-        description = lib.mdDoc ''
+        description = ''
           Extra command-line arguments to pass to {command}`syncthing`.
         '';
       };
@@ -39,8 +38,7 @@ in {
               enable = mkOption {
                 type = types.bool;
                 default = false;
-                description =
-                  lib.mdDoc "Whether to enable a syncthing tray service.";
+                description = "Whether to enable a syncthing tray service.";
               };
 
               command = mkOption {
@@ -48,7 +46,7 @@ in {
                 default = "syncthingtray";
                 defaultText = literalExpression "syncthingtray";
                 example = literalExpression "qsyncthingtray";
-                description = lib.mdDoc "Syncthing tray command to use.";
+                description = "Syncthing tray command to use.";
               };
 
               package = mkOption {
@@ -56,12 +54,12 @@ in {
                 default = pkgs.syncthingtray-minimal;
                 defaultText = literalExpression "pkgs.syncthingtray-minimal";
                 example = literalExpression "pkgs.qsyncthingtray";
-                description = lib.mdDoc "Syncthing tray package to use.";
+                description = "Syncthing tray package to use.";
               };
             };
           });
         default = { enable = false; };
-        description = lib.mdDoc "Syncthing tray service configuration.";
+        description = "Syncthing tray service configuration.";
       };
     };
   };
diff --git a/modules/services/systembus-notify.nix b/modules/services/systembus-notify.nix
index 81df5abca..1b8f1be83 100644
--- a/modules/services/systembus-notify.nix
+++ b/modules/services/systembus-notify.nix
@@ -7,8 +7,8 @@ with lib;
 
   options = {
     services.systembus-notify = {
-      enable = mkEnableOption
-        (lib.mdDoc "systembus-notify - system bus notification daemon");
+      enable =
+        mkEnableOption "systembus-notify - system bus notification daemon";
     };
   };
 
diff --git a/modules/services/taffybar.nix b/modules/services/taffybar.nix
index 9d2c803ac..42ca5f7bb 100644
--- a/modules/services/taffybar.nix
+++ b/modules/services/taffybar.nix
@@ -11,14 +11,14 @@ in {
 
   options = {
     services.taffybar = {
-      enable = mkEnableOption (lib.mdDoc "Taffybar");
+      enable = mkEnableOption "Taffybar";
 
       package = mkOption {
         default = pkgs.taffybar;
         defaultText = literalExpression "pkgs.taffybar";
         type = types.package;
         example = literalExpression "pkgs.taffybar";
-        description = lib.mdDoc "The package to use for the Taffybar binary.";
+        description = "The package to use for the Taffybar binary.";
       };
     };
   };
diff --git a/modules/services/tahoe-lafs.nix b/modules/services/tahoe-lafs.nix
index bdf27a25b..105ef3d03 100644
--- a/modules/services/tahoe-lafs.nix
+++ b/modules/services/tahoe-lafs.nix
@@ -6,7 +6,7 @@ with lib;
   meta.maintainers = [ maintainers.rycee ];
 
   options = {
-    services.tahoe-lafs = { enable = mkEnableOption (lib.mdDoc "Tahoe-LAFS"); };
+    services.tahoe-lafs = { enable = mkEnableOption "Tahoe-LAFS"; };
   };
 
   config = mkIf config.services.tahoe-lafs.enable {
diff --git a/modules/services/taskwarrior-sync.nix b/modules/services/taskwarrior-sync.nix
index e6f415231..9c01f414b 100644
--- a/modules/services/taskwarrior-sync.nix
+++ b/modules/services/taskwarrior-sync.nix
@@ -10,12 +10,12 @@ in {
   meta.maintainers = with maintainers; [ minijackson pacien ];
 
   options.services.taskwarrior-sync = {
-    enable = mkEnableOption (lib.mdDoc "Taskwarrior periodic sync");
+    enable = mkEnableOption "Taskwarrior periodic sync";
 
     frequency = mkOption {
       type = types.str;
       default = "*:0/5";
-      description = lib.mdDoc ''
+      description = ''
         How often to run `taskwarrior sync`. This
         value is passed to the systemd timer configuration as the
         `OnCalendar` option. See
diff --git a/modules/services/trayer.nix b/modules/services/trayer.nix
index d6d179596..48cef7a88 100644
--- a/modules/services/trayer.nix
+++ b/modules/services/trayer.nix
@@ -92,19 +92,19 @@ in {
   options = {
     services.trayer = {
       enable = mkEnableOption
-        (lib.mdDoc "trayer, the lightweight GTK2+ systray for UNIX desktops");
+        "trayer, the lightweight GTK2+ systray for UNIX desktops";
 
       package = mkOption {
         default = pkgs.trayer;
         defaultText = literalExpression "pkgs.trayer";
         type = types.package;
         example = literalExpression "pkgs.trayer";
-        description = lib.mdDoc "The package to use for the trayer binary.";
+        description = "The package to use for the trayer binary.";
       };
 
       settings = mkOption {
         type = with types; attrsOf (nullOr (either str (either bool int)));
-        description = lib.mdDoc ''
+        description = ''
           Trayer configuration as a set of attributes. Further details can be
           found in [trayer's README](https://github.com/sargon/trayer-srg/blob/master/README).
 
diff --git a/modules/services/twmn.nix b/modules/services/twmn.nix
index b6132c167..c29ff621b 100644
--- a/modules/services/twmn.nix
+++ b/modules/services/twmn.nix
@@ -11,7 +11,7 @@ let
       type = types.ints.between 0 40;
       default = 38;
       example = 19;
-      description = lib.mdDoc ''
+      description = ''
         The qt easing-curve animation to use for the animation. See
         [
         QEasingCurve documentation](https://doc.qt.io/qt-5/qeasingcurve.html#Type-enum).
@@ -22,7 +22,7 @@ let
       type = types.ints.unsigned;
       default = 1000;
       example = 618;
-      description = lib.mdDoc "The animation duration in milliseconds.";
+      description = "The animation duration in milliseconds.";
     };
   };
 
@@ -30,14 +30,13 @@ in {
   meta.maintainers = [ hm.maintainers.austreelis ];
 
   options.services.twmn = {
-    enable = mkEnableOption
-      (lib.mdDoc "twmn, a tiling window manager notification daemon");
+    enable = mkEnableOption "twmn, a tiling window manager notification daemon";
 
     duration = mkOption {
       type = types.ints.unsigned;
       default = 3000;
       example = 5000;
-      description = lib.mdDoc ''
+      description = ''
         The time each notification remains visible, in milliseconds.
       '';
     };
@@ -47,7 +46,7 @@ in {
       default = { };
       example = literalExpression
         ''{ main.activation_command = "\${pkgs.hello}/bin/hello"; }'';
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration options to add to the twmnd config file. See
         <https://github.com/sboli/twmn/blob/master/README.md>
         for details.
@@ -58,40 +57,40 @@ in {
       type = types.str;
       default = "127.0.0.1";
       example = "laptop.lan";
-      description = lib.mdDoc "Host address to listen on for notifications.";
+      description = "Host address to listen on for notifications.";
     };
 
     icons = {
       critical = mkOption {
         type = types.nullOr types.path;
         default = null;
-        description = lib.mdDoc "Path to the critical notifications' icon.";
+        description = "Path to the critical notifications' icon.";
       };
 
       info = mkOption {
         type = types.nullOr types.path;
         default = null;
-        description = lib.mdDoc "Path to the informative notifications' icon.";
+        description = "Path to the informative notifications' icon.";
       };
 
       warning = mkOption {
         type = types.nullOr types.path;
         default = null;
-        description = lib.mdDoc "Path to the warning notifications' icon.";
+        description = "Path to the warning notifications' icon.";
       };
     };
 
     port = mkOption {
       type = types.port;
       default = 9797;
-      description = lib.mdDoc "UDP port to listen on for notifications.";
+      description = "UDP port to listen on for notifications.";
     };
 
     screen = mkOption {
       type = types.nullOr types.int;
       default = null;
       example = 0;
-      description = lib.mdDoc ''
+      description = ''
         Screen number to display notifications on when using a multi-head
         desktop.
       '';
@@ -100,8 +99,7 @@ in {
     soundCommand = mkOption {
       type = types.str;
       default = "";
-      description =
-        lib.mdDoc "Command to execute to play a notification's sound.";
+      description = "Command to execute to play a notification's sound.";
     };
 
     text = {
@@ -109,7 +107,7 @@ in {
         type = types.str;
         default = "#999999";
         example = "lightgray";
-        description = lib.mdDoc ''
+        description = ''
           Notification's text color. RGB hex and keywords (e.g. `lightgray`)
           are supported.
         '';
@@ -120,7 +118,7 @@ in {
           type = types.nullOr types.package;
           default = null;
           example = literalExpression "pkgs.dejavu_fonts";
-          description = lib.mdDoc ''
+          description = ''
             Notification text's font package. If `null` then
             the font is assumed to already be available in your profile.
           '';
@@ -130,14 +128,14 @@ in {
           type = types.str;
           default = "Sans";
           example = "Noto Sans";
-          description = lib.mdDoc "Notification text's font family.";
+          description = "Notification text's font family.";
         };
 
         size = mkOption {
           type = types.ints.unsigned;
           default = 13;
           example = 42;
-          description = lib.mdDoc "Notification text's font size.";
+          description = "Notification text's font size.";
         };
 
         variant = mkOption {
@@ -164,7 +162,7 @@ in {
           ];
           default = "medium";
           example = "heavy";
-          description = lib.mdDoc "Notification text's font variant.";
+          description = "Notification text's font variant.";
         };
       };
 
@@ -172,7 +170,7 @@ in {
         type = types.nullOr types.ints.unsigned;
         default = null;
         example = 80;
-        description = lib.mdDoc ''
+        description = ''
           Maximum length of the text before it is cut and suffixed with "...".
           Never cuts if `null`.
         '';
@@ -180,8 +178,8 @@ in {
     };
 
     window = {
-      alwaysOnTop = mkEnableOption
-        (lib.mdDoc "forcing the notification window to always be on top");
+      alwaysOnTop =
+        mkEnableOption "forcing the notification window to always be on top";
 
       animation = {
         easeIn = mkOption {
@@ -193,8 +191,7 @@ in {
               duration = 618;
             }
           '';
-          description =
-            lib.mdDoc "Options for the notification appearance's animation.";
+          description = "Options for the notification appearance's animation.";
         };
 
         easeOut = mkOption {
@@ -207,19 +204,18 @@ in {
             }
           '';
           description =
-            lib.mdDoc "Options for the notification disappearance's animation.";
+            "Options for the notification disappearance's animation.";
         };
 
         bounce = {
-          enable = mkEnableOption (lib.mdDoc
-            "notification bounce when displaying next notification directly");
+          enable = mkEnableOption
+            "notification bounce when displaying next notification directly";
 
           duration = mkOption {
             type = types.ints.unsigned;
             default = 500;
             example = 618;
-            description =
-              lib.mdDoc "The bounce animation duration in milliseconds.";
+            description = "The bounce animation duration in milliseconds.";
           };
         };
       };
@@ -228,7 +224,7 @@ in {
         type = types.str;
         default = "#000000";
         example = "lightgray";
-        description = lib.mdDoc ''
+        description = ''
           Notification's background color. RGB hex and keywords (e.g.
           `lightgray`) are supported.
         '';
@@ -238,7 +234,7 @@ in {
         type = types.ints.unsigned;
         default = 18;
         example = 42;
-        description = lib.mdDoc ''
+        description = ''
           Height of the slide bar. Useful to match your tiling window
           manager's bar.
         '';
@@ -249,7 +245,7 @@ in {
           type = types.int;
           default = 0;
           example = 50;
-          description = lib.mdDoc ''
+          description = ''
             Offset of the notification's slide starting point in pixels on the
             horizontal axis (positive is rightward).
           '';
@@ -259,7 +255,7 @@ in {
           type = types.int;
           default = 0;
           example = -100;
-          description = lib.mdDoc ''
+          description = ''
             Offset of the notification's slide starting point in pixels on the
             vertical axis (positive is upward).
           '';
@@ -270,7 +266,7 @@ in {
         type = types.ints.between 0 100;
         default = 100;
         example = 80;
-        description = lib.mdDoc "The notification window's opacity.";
+        description = "The notification window's opacity.";
       };
 
       position = mkOption {
@@ -292,7 +288,7 @@ in {
         ];
         default = "top_right";
         example = "bottom_left";
-        description = lib.mdDoc ''
+        description = ''
           Position of the notification slide. The notification will slide
           in vertically from the border if placed in
           `top_center` or `bottom_center`,
diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix
index bdb450a70..2572b3594 100644
--- a/modules/services/udiskie.nix
+++ b/modules/services/udiskie.nix
@@ -25,8 +25,8 @@ in {
 
   options = {
     services.udiskie = {
-      enable = mkEnableOption (lib.mdDoc "") // {
-        description = lib.mdDoc ''
+      enable = mkEnableOption "" // {
+        description = ''
           Whether to enable the udiskie mount daemon.
 
           Note, if you use NixOS then you must add
@@ -48,7 +48,7 @@ in {
             icon_names.media = [ "media-optical" ];
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/udiskie/config.yml`.
 
@@ -60,19 +60,19 @@ in {
       automount = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Whether to automatically mount new devices.";
+        description = "Whether to automatically mount new devices.";
       };
 
       notify = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Whether to show pop-up notifications.";
+        description = "Whether to show pop-up notifications.";
       };
 
       tray = mkOption {
         type = types.enum [ "always" "auto" "never" ];
         default = "auto";
-        description = lib.mdDoc ''
+        description = ''
           Whether to display tray icon.
 
           The options are
diff --git a/modules/services/unclutter.nix b/modules/services/unclutter.nix
index c8c369f64..e08c23eb3 100644
--- a/modules/services/unclutter.nix
+++ b/modules/services/unclutter.nix
@@ -7,32 +7,29 @@ let cfg = config.services.unclutter;
 in {
   options.services.unclutter = {
 
-    enable = mkEnableOption (lib.mdDoc "unclutter");
+    enable = mkEnableOption "unclutter";
 
     package = mkOption {
-      description = lib.mdDoc "unclutter derivation to use.";
+      description = "unclutter derivation to use.";
       type = types.package;
       default = pkgs.unclutter-xfixes;
       defaultText = literalExpression "pkgs.unclutter-xfixes";
     };
 
     timeout = mkOption {
-      description =
-        lib.mdDoc "Number of seconds before the cursor is marked inactive.";
+      description = "Number of seconds before the cursor is marked inactive.";
       type = types.int;
       default = 1;
     };
 
     threshold = mkOption {
-      description =
-        lib.mdDoc "Minimum number of pixels considered cursor movement.";
+      description = "Minimum number of pixels considered cursor movement.";
       type = types.int;
       default = 1;
     };
 
     extraOptions = mkOption {
-      description =
-        lib.mdDoc "More arguments to pass to the unclutter command.";
+      description = "More arguments to pass to the unclutter command.";
       type = types.listOf types.str;
       default = [ ];
       example = [ "exclude-root" "ignore-scrolling" ];
diff --git a/modules/services/unison.nix b/modules/services/unison.nix
index 8c1ba47ca..7f8a47a62 100644
--- a/modules/services/unison.nix
+++ b/modules/services/unison.nix
@@ -16,7 +16,7 @@ let
         type = types.path;
         default = "${config.xdg.dataHome}/unison";
         defaultText = "$XDG_DATA_HOME/unison";
-        description = lib.mdDoc ''
+        description = ''
           Unison state directory to use.
         '';
       };
@@ -32,7 +32,7 @@ let
           batch = "true";
           log = "false"; # don't log to file, handled by systemd
         };
-        description = lib.mdDoc ''
+        description = ''
           Additional command line options as a dictionary to pass to the
           `unison` program.
 
@@ -52,7 +52,7 @@ let
             "ssh://remote/documents"
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           Pair of roots to synchronise.
         '';
       };
@@ -74,7 +74,7 @@ in {
   meta.maintainers = with maintainers; [ pacien ];
 
   options.services.unison = {
-    enable = mkEnableOption (lib.mdDoc "Unison synchronisation");
+    enable = mkEnableOption "Unison synchronisation";
 
     pairs = mkOption {
       type = with types; attrsOf (submodule pairOptions);
@@ -89,7 +89,7 @@ in {
           };
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Unison root pairs to keep synchronised.
       '';
     };
diff --git a/modules/services/vdirsyncer.nix b/modules/services/vdirsyncer.nix
index 6d325113f..4eb376f9f 100644
--- a/modules/services/vdirsyncer.nix
+++ b/modules/services/vdirsyncer.nix
@@ -14,20 +14,20 @@ in {
   meta.maintainers = [ maintainers.pjones ];
 
   options.services.vdirsyncer = {
-    enable = mkEnableOption (lib.mdDoc "vdirsyncer");
+    enable = mkEnableOption "vdirsyncer";
 
     package = mkOption {
       type = types.package;
       default = pkgs.vdirsyncer;
       defaultText = "pkgs.vdirsyncer";
       example = literalExpression "pkgs.vdirsyncer";
-      description = lib.mdDoc "The package to use for the vdirsyncer binary.";
+      description = "The package to use for the vdirsyncer binary.";
     };
 
     frequency = mkOption {
       type = types.str;
       default = "*:0/5";
-      description = lib.mdDoc ''
+      description = ''
         How often to run vdirsyncer.  This value is passed to the systemd
         timer configuration as the onCalendar option.  See
         {manpage}`systemd.time(7)`
@@ -39,7 +39,7 @@ in {
       type = types.nullOr
         (types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" ]);
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Whether vdirsyncer should produce verbose output.
       '';
     };
@@ -47,7 +47,7 @@ in {
     configFile = mkOption {
       type = types.nullOr types.path;
       default = null;
-      description = lib.mdDoc ''
+      description = ''
         Optional configuration file to link to use instead of
         the default file ({file}`$XDG_CONFIG_HOME/vdirsyncer/config`).
       '';
diff --git a/modules/services/volnoti.nix b/modules/services/volnoti.nix
index dfeeca215..e90db2c20 100644
--- a/modules/services/volnoti.nix
+++ b/modules/services/volnoti.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     services.volnoti = {
-      enable = mkEnableOption (lib.mdDoc "Volnoti volume HUD daemon");
+      enable = mkEnableOption "Volnoti volume HUD daemon";
 
       package = mkOption {
         type = types.package;
         default = pkgs.volnoti;
         defaultText = literalExpression "pkgs.volnoti";
-        description = lib.mdDoc ''
+        description = ''
           Package containing the {command}`volnoti` program.
         '';
       };
diff --git a/modules/services/window-managers/awesome.nix b/modules/services/window-managers/awesome.nix
index 1daa6a680..d79e72fe5 100644
--- a/modules/services/window-managers/awesome.nix
+++ b/modules/services/window-managers/awesome.nix
@@ -14,19 +14,19 @@ let
 in {
   options = {
     xsession.windowManager.awesome = {
-      enable = mkEnableOption (lib.mdDoc "Awesome window manager");
+      enable = mkEnableOption "Awesome window manager";
 
       package = mkOption {
         type = types.package;
         default = pkgs.awesome;
         defaultText = literalExpression "pkgs.awesome";
-        description = lib.mdDoc "Package to use for running the Awesome WM.";
+        description = "Package to use for running the Awesome WM.";
       };
 
       luaModules = mkOption {
         default = [ ];
         type = types.listOf types.package;
-        description = lib.mdDoc ''
+        description = ''
           List of lua packages available for being
           used in the Awesome configuration.
         '';
@@ -36,7 +36,7 @@ in {
       noArgb = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Disable client transparency support, which can be greatly
           detrimental to performance in some setups
         '';
diff --git a/modules/services/window-managers/bspwm/options.nix b/modules/services/window-managers/bspwm/options.nix
index c23a33463..fab95f88f 100644
--- a/modules/services/window-managers/bspwm/options.nix
+++ b/modules/services/window-managers/bspwm/options.nix
@@ -13,21 +13,21 @@ let
       monitor = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The monitor where the rule should be applied.";
+        description = "The monitor where the rule should be applied.";
         example = "HDMI-0";
       };
 
       desktop = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The desktop where the rule should be applied.";
+        description = "The desktop where the rule should be applied.";
         example = "^8";
       };
 
       node = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The node where the rule should be applied.";
+        description = "The node where the rule should be applied.";
         example = "1";
       };
 
@@ -35,29 +35,28 @@ let
         type = types.nullOr
           (types.enum [ "tiled" "pseudo_tiled" "floating" "fullscreen" ]);
         default = null;
-        description = lib.mdDoc "The state in which a new window should spawn.";
+        description = "The state in which a new window should spawn.";
         example = "floating";
       };
 
       layer = mkOption {
         type = types.nullOr (types.enum [ "below" "normal" "above" ]);
         default = null;
-        description = lib.mdDoc "The layer where a new window should spawn.";
+        description = "The layer where a new window should spawn.";
         example = "above";
       };
 
       splitDir = mkOption {
         type = types.nullOr (types.enum [ "north" "west" "south" "east" ]);
         default = null;
-        description =
-          lib.mdDoc "The direction where the container is going to be split.";
+        description = "The direction where the container is going to be split.";
         example = "south";
       };
 
       splitRatio = mkOption {
         type = types.nullOr types.float;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           The ratio between the new window and the previous existing window in
           the desktop.
         '';
@@ -67,22 +66,21 @@ let
       hidden = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc "Whether the node should occupy any space.";
+        description = "Whether the node should occupy any space.";
         example = true;
       };
 
       sticky = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description =
-          lib.mdDoc "Whether the node should stay on the focused desktop.";
+        description = "Whether the node should stay on the focused desktop.";
         example = true;
       };
 
       private = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Whether the node should stay in the same tiling position and size.
         '';
         example = true;
@@ -91,7 +89,7 @@ let
       locked = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Whether the node should ignore {command}`node --close`
           messages.
         '';
@@ -101,15 +99,14 @@ let
       marked = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description =
-          lib.mdDoc "Whether the node will be marked for deferred actions.";
+        description = "Whether the node will be marked for deferred actions.";
         example = true;
       };
 
       center = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Whether the node will be put in the center, in floating mode.
         '';
         example = true;
@@ -118,15 +115,14 @@ let
       follow = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description =
-          lib.mdDoc "Whether focus should follow the node when it is moved.";
+        description = "Whether focus should follow the node when it is moved.";
         example = true;
       };
 
       manage = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Whether the window should be managed by bspwm. If false, the window
           will be ignored by bspwm entirely. This is useful for overlay apps,
           e.g. screenshot tools.
@@ -137,22 +133,21 @@ let
       focus = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description =
-          lib.mdDoc "Whether the node should gain focus on creation.";
+        description = "Whether the node should gain focus on creation.";
         example = true;
       };
 
       border = mkOption {
         type = types.nullOr types.bool;
         default = null;
-        description = lib.mdDoc "Whether the node should have border.";
+        description = "Whether the node should have border.";
         example = true;
       };
 
       rectangle = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc "The node's geometry, in the format `WxH+X+Y`.";
+        description = "The node's geometry, in the format `WxH+X+Y`.";
         example = "800x600+32+32";
       };
     };
@@ -160,20 +155,20 @@ let
 
 in {
   xsession.windowManager.bspwm = {
-    enable = mkEnableOption (lib.mdDoc "bspwm window manager");
+    enable = mkEnableOption "bspwm window manager";
 
     package = mkOption {
       type = types.package;
       default = pkgs.bspwm;
       defaultText = literalExpression "pkgs.bspwm";
-      description = lib.mdDoc "The bspwm package to use.";
+      description = "The bspwm package to use.";
       example = literalExpression "pkgs.bspwm-unstable";
     };
 
     settings = mkOption {
       type = with types; attrsOf (either primitive (listOf primitive));
       default = { };
-      description = lib.mdDoc "General settings given to `bspc config`.";
+      description = "General settings given to `bspc config`.";
       example = {
         "border_width" = 2;
         "split_ratio" = 0.52;
@@ -184,7 +179,7 @@ in {
     extraConfig = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc
+      description =
         "Additional shell commands to be run at the end of the config file.";
       example = ''
         bspc subscribe all > ~/bspc-report.log &
@@ -194,7 +189,7 @@ in {
     extraConfigEarly = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc
+      description =
         "Like extraConfig, except commands are run at the start of the config file.";
     };
 
@@ -202,14 +197,14 @@ in {
       type = types.attrsOf (types.listOf types.str);
       default = { };
       description =
-        lib.mdDoc "Specifies the names of desktops to create on each monitor.";
+        "Specifies the names of desktops to create on each monitor.";
       example = { "HDMI-0" = [ "web" "terminal" "III" "IV" ]; };
     };
 
     alwaysResetDesktops = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         If set to `true`, desktops configured in {option}`monitors` will be reset
         every time the config is run.
 
@@ -222,7 +217,7 @@ in {
     rules = mkOption {
       type = types.attrsOf rule;
       default = { };
-      description = lib.mdDoc
+      description =
         "Rule configuration. The keys of the attribute set are the targets of the rules.";
       example = literalExpression ''
         {
@@ -244,7 +239,7 @@ in {
     startupPrograms = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description = lib.mdDoc "Programs to be executed during startup.";
+      description = "Programs to be executed during startup.";
       example = [ "numlockx on" "tilda" ];
     };
   };
diff --git a/modules/services/window-managers/fluxbox.nix b/modules/services/window-managers/fluxbox.nix
index 7b03650d8..99dfa50e0 100644
--- a/modules/services/window-managers/fluxbox.nix
+++ b/modules/services/window-managers/fluxbox.nix
@@ -11,14 +11,14 @@ in {
 
   options = {
     xsession.windowManager.fluxbox = {
-      enable = mkEnableOption (lib.mdDoc "Fluxbox window manager");
+      enable = mkEnableOption "Fluxbox window manager";
 
-      package = mkPackageOptionMD pkgs "fluxbox" { };
+      package = mkPackageOption pkgs "fluxbox" { };
 
       init = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Init configuration for Fluxbox, written to
           {file}`~/.fluxbox/init`. Look at the
           {manpage}`fluxbox(1)` manpage for details.
@@ -28,7 +28,7 @@ in {
       apps = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Apps configuration for Fluxbox, written to
           {file}`~/.fluxbox/apps`. Look at the
           {manpage}`fluxbox(1)` manpage for details.
@@ -38,7 +38,7 @@ in {
       keys = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Keyboard shortcuts configuration for Fluxbox, written to
           {file}`~/.fluxbox/keys`. Look at the
           {manpage}`fluxbox-keys(1)` manpage for details.
@@ -48,7 +48,7 @@ in {
       menu = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Menu configuration for Fluxbox, written to
           {file}`~/.fluxbox/menu`. Look at the
           {manpage}`fluxbox-menu(1)` manpage for details.
@@ -58,7 +58,7 @@ in {
       slitlist = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Slitlist configuration for Fluxbox, written to
           {file}`~/.fluxbox/slitlist`. Look at the
           {manpage}`fluxbox(1)` manpage for details.
@@ -68,7 +68,7 @@ in {
       windowmenu = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           Window menu configuration for Fluxbox, written to
           {file}`~/.fluxbox/windowmenu`. Look at the
           {manpage}`fluxbox-menu(1)`
@@ -80,7 +80,7 @@ in {
         type = with types; listOf str;
         default = [ ];
         example = [ "-log" "/tmp/fluxbox.log" ];
-        description = lib.mdDoc ''
+        description = ''
           Extra command line arguments to pass to {command}`fluxbox`.
           Look at the
           {manpage}`fluxbox(1)` manpage for details.
diff --git a/modules/services/window-managers/herbstluftwm.nix b/modules/services/window-managers/herbstluftwm.nix
index be669dce4..a407da6cc 100644
--- a/modules/services/window-managers/herbstluftwm.nix
+++ b/modules/services/window-managers/herbstluftwm.nix
@@ -35,13 +35,13 @@ in {
   meta.maintainers = [ lib.hm.maintainers.olmokramer ];
 
   options.xsession.windowManager.herbstluftwm = {
-    enable = lib.mkEnableOption (lib.mdDoc "herbstluftwm window manager");
+    enable = lib.mkEnableOption "herbstluftwm window manager";
 
     package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.herbstluftwm;
       defaultText = lib.literalExpression "pkgs.herbstluftwm";
-      description = lib.mdDoc ''
+      description = ''
         Package providing the {command}`herbstluftwm` and
         {command}`herbstclient` commands.
       '';
@@ -57,7 +57,7 @@ in {
           window_border_active_color = "#FF0000";
         }
       '';
-      description = lib.mdDoc "Herbstluftwm settings.";
+      description = "Herbstluftwm settings.";
     };
 
     keybinds = lib.mkOption {
@@ -69,7 +69,7 @@ in {
           Mod4-u = "split bottom";
         }
       '';
-      description = lib.mdDoc "Herbstluftwm keybinds.";
+      description = "Herbstluftwm keybinds.";
     };
 
     mousebinds = lib.mkOption {
@@ -81,7 +81,7 @@ in {
           Mod4-B3 = "resize";
         }
       '';
-      description = lib.mdDoc "Herbstluftwm mousebinds.";
+      description = "Herbstluftwm mousebinds.";
     };
 
     rules = lib.mkOption {
@@ -93,7 +93,7 @@ in {
           "windowtype~'_NET_WM_WINDOW_TYPE_(NOTIFICATION|DOCK|DESKTOP)' manage=off"
         ]
       '';
-      description = lib.mdDoc "Herbstluftwm rules.";
+      description = "Herbstluftwm rules.";
     };
 
     tags = lib.mkOption {
@@ -102,7 +102,7 @@ in {
       example = lib.literalExpression ''
         [ "work" "browser" "music" "gaming" ]
       '';
-      description = lib.mdDoc "Tags to create on startup.";
+      description = "Tags to create on startup.";
     };
 
     extraConfig = lib.mkOption {
@@ -112,7 +112,7 @@ in {
         herbstclient set_layout max
         herbstclient detect_monitors
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra configuration lines to add verbatim to
         {file}`$XDG_CONFIG_HOME/herbstluftwm/autostart`.
       '';
diff --git a/modules/services/window-managers/i3-sway/i3.nix b/modules/services/window-managers/i3-sway/i3.nix
index dd5f452ef..183463d31 100644
--- a/modules/services/window-managers/i3-sway/i3.nix
+++ b/modules/services/window-managers/i3-sway/i3.nix
@@ -91,7 +91,7 @@ let
           "${cfg.config.modifier}+r" = "mode resize";
         };
         defaultText = "Default i3 keybindings.";
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that assigns a key press to an action using a key symbol.
           See <https://i3wm.org/docs/userguide.html#keybindings>.
 
@@ -121,7 +121,7 @@ let
             "Return" = "mode default";
           };
         };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that defines binding modes and keybindings
           inside them
 
@@ -206,21 +206,21 @@ in {
 
   options = {
     xsession.windowManager.i3 = {
-      enable = mkEnableOption (lib.mdDoc "i3 window manager");
+      enable = mkEnableOption "i3 window manager";
 
-      package = mkPackageOptionMD pkgs "i3" { };
+      package = mkPackageOption pkgs "i3" { };
 
       config = mkOption {
         type = types.nullOr configModule;
         default = { };
-        description = lib.mdDoc "i3 configuration options.";
+        description = "i3 configuration options.";
       };
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
         description =
-          lib.mdDoc "Extra configuration lines to add to ~/.config/i3/config.";
+          "Extra configuration lines to add to ~/.config/i3/config.";
       };
     };
   };
diff --git a/modules/services/window-managers/i3-sway/lib/options.nix b/modules/services/window-managers/i3-sway/lib/options.nix
index ca4cfa88b..b9182439c 100644
--- a/modules/services/window-managers/i3-sway/lib/options.nix
+++ b/modules/services/window-managers/i3-sway/lib/options.nix
@@ -14,7 +14,7 @@ let
         type = types.listOf types.str;
         default = [ "monospace" ];
         defaultText = literalExpression ''[ "monospace" ]'';
-        description = lib.mdDoc ''
+        description = ''
           List of font names list used for window titles. Only FreeType fonts are supported.
           The order here is important (e.g. icons font should go before the one used for text).
         '';
@@ -24,7 +24,7 @@ let
       style = mkOption {
         type = types.str;
         default = "";
-        description = lib.mdDoc ''
+        description = ''
           The font style to use for window titles.
         '';
         example = "Bold Semi-Condensed";
@@ -33,7 +33,7 @@ let
       size = mkOption {
         type = types.float;
         default = 8.0;
-        description = lib.mdDoc ''
+        description = ''
           The font size to use for window titles.
         '';
         example = 11.5;
@@ -45,20 +45,19 @@ let
     options = {
       command = mkOption {
         type = types.str;
-        description = lib.mdDoc "Command that will be executed on startup.";
+        description = "Command that will be executed on startup.";
       };
 
       always = mkOption {
         type = types.bool;
         default = false;
-        description =
-          lib.mdDoc "Whether to run command on each ${moduleName} restart.";
+        description = "Whether to run command on each ${moduleName} restart.";
       };
     } // optionalAttrs isI3 {
       notification = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable startup-notification support for the command.
           See {option}`--no-startup-id` option description in the i3 user guide.
         '';
@@ -67,7 +66,7 @@ let
       workspace = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Launch application on a particular workspace. DEPRECATED:
           Use [](#opt-xsession.windowManager.i3.config.assigns)
           instead. See <https://github.com/nix-community/home-manager/issues/265>.
@@ -100,19 +99,19 @@ let
             size = 11.0;
           }
         '';
-        description = lib.mdDoc "Font configuration for this bar.";
+        description = "Font configuration for this bar.";
       };
 
       extraConfig = mkOption {
         type = types.lines;
         default = "";
-        description = lib.mdDoc "Extra configuration lines for this bar.";
+        description = "Extra configuration lines for this bar.";
       };
 
       id = mkOption {
         type = types.nullOr types.str;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Specifies the bar ID for the configured bar instance.
           If this option is missing, the ID is set to bar-x, where x corresponds
           to the position of the embedding bar block in the config file.
@@ -122,34 +121,31 @@ let
       mode = mkNullableOption {
         type = types.enum [ "dock" "hide" "invisible" ];
         default = "dock";
-        description = lib.mdDoc "Bar visibility mode.";
+        description = "Bar visibility mode.";
       };
 
       hiddenState = mkNullableOption {
         type = types.enum [ "hide" "show" ];
         default = "hide";
-        description =
-          lib.mdDoc "The default bar mode when 'bar.mode' == 'hide'.";
+        description = "The default bar mode when 'bar.mode' == 'hide'.";
       };
 
       position = mkNullableOption {
         type = types.enum [ "top" "bottom" ];
         default = "bottom";
-        description =
-          lib.mdDoc "The edge of the screen ${moduleName}bar should show up.";
+        description = "The edge of the screen ${moduleName}bar should show up.";
       };
 
       workspaceButtons = mkNullableOption {
         type = types.bool;
         default = true;
-        description =
-          lib.mdDoc "Whether workspace buttons should be shown or not.";
+        description = "Whether workspace buttons should be shown or not.";
       };
 
       workspaceNumbers = mkNullableOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc
+        description =
           "Whether workspace numbers should be displayed within the workspace buttons.";
       };
 
@@ -161,7 +157,7 @@ let
           pkg = if isSway && isNull cfg.package then pkgs.sway else cfg.package;
         in "${pkg}/bin/${moduleName}bar";
         defaultText = "i3bar";
-        description = lib.mdDoc "Command that will be used to start a bar.";
+        description = "Command that will be used to start a bar.";
         example = if isI3 then
           "\${pkgs.i3}/bin/i3bar -t"
         else
@@ -171,8 +167,7 @@ let
       statusCommand = mkNullableOption {
         type = types.str;
         default = "${pkgs.i3status}/bin/i3status";
-        description =
-          lib.mdDoc "Command that will be used to get status lines.";
+        description = "Command that will be used to get status lines.";
       };
 
       colors = mkOption {
@@ -181,27 +176,25 @@ let
             background = mkNullableOption {
               type = types.str;
               default = "#000000";
-              description = lib.mdDoc "Background color of the bar.";
+              description = "Background color of the bar.";
             };
 
             statusline = mkNullableOption {
               type = types.str;
               default = "#ffffff";
-              description =
-                lib.mdDoc "Text color to be used for the statusline.";
+              description = "Text color to be used for the statusline.";
             };
 
             separator = mkNullableOption {
               type = types.str;
               default = "#666666";
-              description =
-                lib.mdDoc "Text color to be used for the separator.";
+              description = "Text color to be used for the separator.";
             };
 
             focusedBackground = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc
+              description =
                 "Background color of the bar on the currently focused monitor output.";
               example = "#000000";
             };
@@ -209,7 +202,7 @@ let
             focusedStatusline = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc
+              description =
                 "Text color to be used for the statusline on the currently focused monitor output.";
               example = "#ffffff";
             };
@@ -217,7 +210,7 @@ let
             focusedSeparator = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = lib.mdDoc
+              description =
                 "Text color to be used for the separator on the currently focused monitor output.";
               example = "#666666";
             };
@@ -229,7 +222,7 @@ let
                 background = "#285577";
                 text = "#ffffff";
               };
-              description = lib.mdDoc ''
+              description = ''
                 Border, background and text color for a workspace button when the workspace has focus.
               '';
             };
@@ -241,7 +234,7 @@ let
                 background = "#5f676a";
                 text = "#ffffff";
               };
-              description = lib.mdDoc ''
+              description = ''
                 Border, background and text color for a workspace button when the workspace is active.
               '';
             };
@@ -253,7 +246,7 @@ let
                 background = "#222222";
                 text = "#888888";
               };
-              description = lib.mdDoc ''
+              description = ''
                 Border, background and text color for a workspace button when the workspace does not
                 have focus and is not active.
               '';
@@ -266,7 +259,7 @@ let
                 background = "#900000";
                 text = "#ffffff";
               };
-              description = lib.mdDoc ''
+              description = ''
                 Border, background and text color for a workspace button when the workspace contains
                 a window with the urgency hint set.
               '';
@@ -279,13 +272,13 @@ let
                 background = "#900000";
                 text = "#ffffff";
               };
-              description = lib.mdDoc
+              description =
                 "Border, background and text color for the binding mode indicator";
             };
           };
         };
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Bar color settings. All color classes can be specified using submodules
           with 'border', 'background', 'text', fields and RGB color hex-codes as values.
           See default values for the reference.
@@ -298,13 +291,13 @@ let
       trayOutput = mkNullableOption {
         type = types.str;
         default = "primary";
-        description = lib.mdDoc "Where to output tray.";
+        description = "Where to output tray.";
       };
 
       trayPadding = mkNullableOption {
         type = types.int;
         default = null;
-        description = lib.mdDoc ''
+        description = ''
           Sets the pixel padding of the system tray.
           This padding will surround the tray on all sides and between each item.
         '';
@@ -364,13 +357,13 @@ let
     options = {
       command = mkOption {
         type = types.str;
-        description = lib.mdDoc "${capitalModuleName}wm command to execute.";
+        description = "${capitalModuleName}wm command to execute.";
         example = "border pixel 1";
       };
 
       criteria = mkOption {
         type = criteriaModule;
-        description = lib.mdDoc ''
+        description = ''
           Criteria of the windows on which command should be executed.
 
           A value of `true` is equivalent to using an empty
@@ -398,7 +391,7 @@ in {
         size = 11.0;
       }
     '';
-    description = lib.mdDoc "Font configuration for window titles, nagbar...";
+    description = "Font configuration for window titles, nagbar...";
   };
 
   window = mkOption {
@@ -417,26 +410,25 @@ in {
             true for state version ≥ 23.05
             false for state version < 23.05
           '';
-          description = lib.mdDoc "Whether to show window titlebars.";
+          description = "Whether to show window titlebars.";
         };
 
         border = mkOption {
           type = types.int;
           default = 2;
-          description = lib.mdDoc "Window border width.";
+          description = "Window border width.";
         };
 
         hideEdgeBorders = mkOption {
           type = types.enum [ "none" "vertical" "horizontal" "both" "smart" ];
           default = "none";
-          description =
-            lib.mdDoc "Hide window borders adjacent to the screen edges.";
+          description = "Hide window borders adjacent to the screen edges.";
         };
 
         commands = mkOption {
           type = types.listOf windowCommandModule;
           default = [ ];
-          description = lib.mdDoc ''
+          description = ''
             List of commands that should be executed on specific windows.
             See {option}`for_window` ${moduleName}wm option documentation.
           '';
@@ -448,7 +440,7 @@ in {
       };
     };
     default = { };
-    description = lib.mdDoc "Window titlebar and border settings.";
+    description = "Window titlebar and border settings.";
   };
 
   floating = mkOption {
@@ -467,20 +459,20 @@ in {
             true for state version ≥ 23.05
             false for state version < 23.05
           '';
-          description = lib.mdDoc "Whether to show floating window titlebars.";
+          description = "Whether to show floating window titlebars.";
         };
 
         border = mkOption {
           type = types.int;
           default = 2;
-          description = lib.mdDoc "Floating windows border width.";
+          description = "Floating windows border width.";
         };
 
         modifier = mkOption {
           type = types.str;
           default = cfg.config.modifier;
           defaultText = "${moduleName}.config.modifier";
-          description = lib.mdDoc
+          description =
             "Modifier key or keys that can be used to drag floating windows.";
           example = "Mod4";
         };
@@ -488,7 +480,7 @@ in {
         criteria = mkOption {
           type = types.listOf criteriaModule;
           default = [ ];
-          description = lib.mdDoc
+          description =
             "List of criteria for windows that should be opened in a floating mode.";
           example = [
             { "title" = "Steam - Update News"; }
@@ -498,7 +490,7 @@ in {
       };
     };
     default = { };
-    description = lib.mdDoc "Floating window settings.";
+    description = "Floating window settings.";
   };
 
   focus = mkOption {
@@ -507,7 +499,7 @@ in {
         newWindow = mkOption {
           type = types.enum [ "smart" "urgent" "focus" "none" ];
           default = "smart";
-          description = lib.mdDoc ''
+          description = ''
             This option modifies focus behavior on new window activation.
 
             See <https://i3wm.org/docs/userguide.html#focus_on_window_activation>
@@ -521,7 +513,7 @@ in {
           else
             types.bool;
           default = if isSway then "yes" else true;
-          description = lib.mdDoc "Whether focus should follow the mouse.";
+          description = "Whether focus should follow the mouse.";
           apply = val:
             if (isSway && isBool val) then (lib.hm.booleans.yesNo val) else val;
         };
@@ -534,7 +526,7 @@ in {
             # so preserve it for backwards compatibility purposes
             sway = if cfg.config.focus.forceWrapping then "yes" else "no";
           }.${moduleName};
-          description = lib.mdDoc ''
+          description = ''
             Whether the window focus commands automatically wrap around the edge of containers.
 
             See <https://i3wm.org/docs/userguide.html#_focus_wrapping>
@@ -544,7 +536,7 @@ in {
         forceWrapping = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             Whether to force focus wrapping in tabbed or stacked containers.
 
             This option is deprecated, use {option}`focus.wrapping` instead.
@@ -557,7 +549,7 @@ in {
           else
             types.bool;
           default = true;
-          description = lib.mdDoc ''
+          description = ''
             Whether mouse cursor should be warped to the center of the window when switching focus
             to a window on a different output.
           '';
@@ -565,13 +557,13 @@ in {
       };
     };
     default = { };
-    description = lib.mdDoc "Focus related settings.";
+    description = "Focus related settings.";
   };
 
   assigns = mkOption {
     type = types.attrsOf (types.listOf criteriaModule);
     default = { };
-    description = lib.mdDoc ''
+    description = ''
       An attribute set that assigns applications to workspaces based
       on criteria.
     '';
@@ -586,8 +578,7 @@ in {
   modifier = mkOption {
     type = types.enum [ "Shift" "Control" "Mod1" "Mod2" "Mod3" "Mod4" "Mod5" ];
     default = "Mod1";
-    description =
-      lib.mdDoc "Modifier key that is used for all default keybindings.";
+    description = "Modifier key that is used for all default keybindings.";
     example = "Mod4";
   };
 
@@ -595,7 +586,7 @@ in {
     type = types.enum [ "default" "stacking" "tabbed" ];
     default = "default";
     example = "tabbed";
-    description = lib.mdDoc ''
+    description = ''
       The mode in which new containers on workspace level will
       start.
     '';
@@ -605,7 +596,7 @@ in {
     type = types.bool;
     default = false;
     example = true;
-    description = lib.mdDoc ''
+    description = ''
       Assume you are on workspace "1: www" and switch to "2: IM" using
       mod+2 because somebody sent you a message. You don’t need to remember
       where you came from now, you can just press $mod+2 again to switch
@@ -616,7 +607,7 @@ in {
   keycodebindings = mkOption {
     type = types.attrsOf (types.nullOr types.str);
     default = { };
-    description = lib.mdDoc ''
+    description = ''
       An attribute set that assigns keypress to an action using key code.
       See <https://i3wm.org/docs/userguide.html#keybindings>.
     '';
@@ -629,7 +620,7 @@ in {
         background = mkOption {
           type = types.str;
           default = "#ffffff";
-          description = lib.mdDoc ''
+          description = ''
             Background color of the window. Only applications which do not cover
             the whole area expose the color.
           '';
@@ -644,7 +635,7 @@ in {
             indicator = "#2e9ef4";
             childBorder = "#285577";
           };
-          description = lib.mdDoc "A window which currently has the focus.";
+          description = "A window which currently has the focus.";
         };
 
         focusedInactive = mkOption {
@@ -656,7 +647,7 @@ in {
             indicator = "#484e50";
             childBorder = "#5f676a";
           };
-          description = lib.mdDoc ''
+          description = ''
             A window which is the focused one of its container,
             but it does not have the focus at the moment.
           '';
@@ -671,7 +662,7 @@ in {
             indicator = "#292d2e";
             childBorder = "#222222";
           };
-          description = lib.mdDoc "A window which is not focused.";
+          description = "A window which is not focused.";
         };
 
         urgent = mkOption {
@@ -683,8 +674,7 @@ in {
             indicator = "#900000";
             childBorder = "#900000";
           };
-          description =
-            lib.mdDoc "A window which has its urgency hint activated.";
+          description = "A window which has its urgency hint activated.";
         };
 
         placeholder = mkOption {
@@ -696,7 +686,7 @@ in {
             indicator = "#000000";
             childBorder = "#0c0c0c";
           };
-          description = lib.mdDoc ''
+          description = ''
             Background and text color are used to draw placeholder window
             contents (when restoring layouts). Border and indicator are ignored.
           '';
@@ -704,7 +694,7 @@ in {
       };
     };
     default = { };
-    description = lib.mdDoc ''
+    description = ''
       Color settings. All color classes can be specified using submodules
       with 'border', 'background', 'text', 'indicator' and 'childBorder' fields
       and RGB color hex-codes as values. See default values for the reference.
@@ -761,7 +751,7 @@ in {
     }] else
       [ { } ];
     defaultText = literalExpression "see code";
-    description = lib.mdDoc ''
+    description = ''
       ${capitalModuleName} bars settings blocks. Set to empty list to remove bars completely.
     '';
   };
@@ -769,7 +759,7 @@ in {
   startup = mkOption {
     type = types.listOf startupModule;
     default = [ ];
-    description = lib.mdDoc ''
+    description = ''
       Commands that should be executed at startup.
 
       See <https://i3wm.org/docs/userguide.html#_automatically_starting_applications_on_i3_startup>.
@@ -798,63 +788,63 @@ in {
         inner = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Inner gaps value.";
+          description = "Inner gaps value.";
           example = 12;
         };
 
         outer = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Outer gaps value.";
+          description = "Outer gaps value.";
           example = 5;
         };
 
         horizontal = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Horizontal gaps value.";
+          description = "Horizontal gaps value.";
           example = 5;
         };
 
         vertical = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Vertical gaps value.";
+          description = "Vertical gaps value.";
           example = 5;
         };
 
         top = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Top gaps value.";
+          description = "Top gaps value.";
           example = 5;
         };
 
         left = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Left gaps value.";
+          description = "Left gaps value.";
           example = 5;
         };
 
         bottom = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Bottom gaps value.";
+          description = "Bottom gaps value.";
           example = 5;
         };
 
         right = mkOption {
           type = types.nullOr types.int;
           default = null;
-          description = lib.mdDoc "Right gaps value.";
+          description = "Right gaps value.";
           example = 5;
         };
 
         smartGaps = mkOption {
           type = types.bool;
           default = false;
-          description = lib.mdDoc ''
+          description = ''
             This option controls whether to disable all gaps (outer and inner)
             on workspace with a single container.
           '';
@@ -864,7 +854,7 @@ in {
         smartBorders = mkOption {
           type = types.enum [ "on" "off" "no_gaps" ];
           default = "off";
-          description = lib.mdDoc ''
+          description = ''
             This option controls whether to disable container borders on
             workspace with a single container.
           '';
@@ -872,7 +862,7 @@ in {
       };
     });
     default = null;
-    description = lib.mdDoc ''
+    description = ''
       Gaps related settings.
     '';
   };
@@ -880,7 +870,7 @@ in {
   terminal = mkOption {
     type = types.str;
     default = if isI3 then "i3-sensible-terminal" else "${pkgs.foot}/bin/foot";
-    description = lib.mdDoc "Default terminal to run.";
+    description = "Default terminal to run.";
     example = "alacritty";
   };
 
@@ -890,14 +880,14 @@ in {
       "${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu | ${pkgs.findutils}/bin/xargs swaymsg exec --"
     else
       "${pkgs.dmenu}/bin/dmenu_run";
-    description = lib.mdDoc "Default launcher to use.";
+    description = "Default launcher to use.";
     example = "bemenu-run";
   };
 
   defaultWorkspace = mkOption {
     type = types.nullOr types.str;
     default = null;
-    description = lib.mdDoc ''
+    description = ''
       The default workspace to show when ${
         if isSway then "sway" else "i3"
       } is launched.
@@ -915,7 +905,7 @@ in {
               type = str;
               default = "";
               example = "Web";
-              description = lib.mdDoc ''
+              description = ''
                 Name of the workspace to assign.
               '';
             };
@@ -925,7 +915,7 @@ in {
               default = "";
               apply = lists.toList;
               example = "eDP";
-              description = lib.mdDoc ''
+              description = ''
                 Name(s) of the output(s) from {command}`
                   ${if isSway then "swaymsg" else "i3-msg"} -t get_outputs
                 `.
@@ -935,6 +925,6 @@ in {
         };
       in listOf workspaceOutputOpts;
     default = [ ];
-    description = lib.mdDoc "Assign workspaces to outputs.";
+    description = "Assign workspaces to outputs.";
   };
 }
diff --git a/modules/services/window-managers/i3-sway/sway.nix b/modules/services/window-managers/i3-sway/sway.nix
index a37f44199..9031a0a70 100644
--- a/modules/services/window-managers/i3-sway/sway.nix
+++ b/modules/services/window-managers/i3-sway/sway.nix
@@ -22,25 +22,25 @@ let
       left = mkOption {
         type = types.str;
         default = "h";
-        description = lib.mdDoc "Home row direction key for moving left.";
+        description = "Home row direction key for moving left.";
       };
 
       down = mkOption {
         type = types.str;
         default = "j";
-        description = lib.mdDoc "Home row direction key for moving down.";
+        description = "Home row direction key for moving down.";
       };
 
       up = mkOption {
         type = types.str;
         default = "k";
-        description = lib.mdDoc "Home row direction key for moving up.";
+        description = "Home row direction key for moving up.";
       };
 
       right = mkOption {
         type = types.str;
         default = "l";
-        description = lib.mdDoc "Home row direction key for moving right.";
+        description = "Home row direction key for moving right.";
       };
 
       keybindings = mkOption {
@@ -121,7 +121,7 @@ let
           "${cfg.config.modifier}+r" = "mode resize";
         };
         defaultText = "Default sway keybindings.";
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that assigns a key press to an action using a key symbol.
           See <https://i3wm.org/docs/userguide.html#keybindings>.
 
@@ -143,7 +143,7 @@ let
         type = types.bool;
         default = false;
         example = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether to make use of {option}`--to-code` in keybindings.
         '';
       };
@@ -152,7 +152,7 @@ let
         type = types.attrsOf (types.attrsOf types.str);
         default = { };
         example = { "*" = { xkb_variant = "dvorak"; }; };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that defines input modules. See
           {manpage}`sway-input(5)`
           for options.
@@ -163,7 +163,7 @@ let
         type = types.attrsOf (types.attrsOf types.str);
         default = { };
         example = { "HDMI-A-2" = { bg = "~/path/to/background.png fill"; }; };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that defines output modules. See
           {manpage}`sway-output(5)`
           for options.
@@ -174,7 +174,7 @@ let
         type = types.attrsOf (types.attrsOf types.str);
         default = { };
         example = { "*" = { hide_cursor = "when-typing enable"; }; };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that defines seat modules. See
           {manpage}`sway-input(5)`
           for options.
@@ -197,7 +197,7 @@ let
             "Return" = "mode default";
           };
         };
-        description = lib.mdDoc ''
+        description = ''
           An attribute set that defines binding modes and keybindings
           inside them
 
@@ -215,7 +215,7 @@ let
           type = types.bool;
           inherit default;
           example = !default;
-          description = lib.mdDoc "Whether to make use of the ${description}";
+          description = "Whether to make use of the ${description}";
         };
     in {
       base = mkWrapperFeature true ''
@@ -334,13 +334,13 @@ in {
   ];
 
   options.wayland.windowManager.sway = {
-    enable = mkEnableOption (lib.mdDoc "sway wayland compositor");
+    enable = mkEnableOption "sway wayland compositor";
 
     package = mkOption {
       type = with types; nullOr package;
       default = defaultSwayPackage;
       defaultText = literalExpression "${pkgs.sway}";
-      description = lib.mdDoc ''
+      description = ''
         Sway package to use. Will override the options
         'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'.
         Set to `null` to not add any Sway package to your
@@ -354,7 +354,7 @@ in {
         type = types.bool;
         default = pkgs.stdenv.isLinux;
         example = false;
-        description = lib.mdDoc ''
+        description = ''
           Whether to enable {file}`sway-session.target` on
           sway startup. This links to
           {file}`graphical-session.target`.
@@ -367,16 +367,16 @@ in {
         '';
       };
 
-      xdgAutostart = mkEnableOption (lib.mdDoc ''
+      xdgAutostart = mkEnableOption ''
         autostart of applications using
         {manpage}`systemd-xdg-autostart-generator(8)`
-      '');
+      '';
     };
 
     xwayland = mkOption {
       type = types.bool;
       default = true;
-      description = lib.mdDoc ''
+      description = ''
         Enable xwayland, which is needed for the default configuration of sway.
       '';
     };
@@ -385,7 +385,7 @@ in {
       type = wrapperOptions;
       default = { };
       example = { gtk = true; };
-      description = lib.mdDoc ''
+      description = ''
         Attribute set of features to enable in the wrapper.
       '';
     };
@@ -402,7 +402,7 @@ in {
         # use this if they aren't displayed properly:
         export _JAVA_AWT_WM_NONREPARENTING=1
       '';
-      description = lib.mdDoc ''
+      description = ''
         Shell commands executed just before Sway is started.
       '';
     };
@@ -416,7 +416,7 @@ in {
         "--unsupported-gpu"
         "--my-next-gpu-wont-be-nvidia"
       ];
-      description = lib.mdDoc ''
+      description = ''
         Command line arguments passed to launch Sway. Please DO NOT report
         issues if you use an unsupported GPU (proprietary drivers).
       '';
@@ -425,20 +425,20 @@ in {
     config = mkOption {
       type = types.nullOr configModule;
       default = { };
-      description = lib.mdDoc "Sway configuration options.";
+      description = "Sway configuration options.";
     };
 
     extraConfig = mkOption {
       type = types.lines;
       default = "";
       description =
-        lib.mdDoc "Extra configuration lines to add to ~/.config/sway/config.";
+        "Extra configuration lines to add to ~/.config/sway/config.";
     };
 
     extraConfigEarly = mkOption {
       type = types.lines;
       default = "";
-      description = lib.mdDoc
+      description =
         "Like extraConfig, except lines are added to ~/.config/sway/config before all other configuration.";
     };
   };
diff --git a/modules/services/window-managers/i3-sway/swaynag.nix b/modules/services/window-managers/i3-sway/swaynag.nix
index d8b027239..fcdedd3d8 100644
--- a/modules/services/window-managers/i3-sway/swaynag.nix
+++ b/modules/services/window-managers/i3-sway/swaynag.nix
@@ -18,13 +18,13 @@ in {
 
   options = {
     wayland.windowManager.sway.swaynag = {
-      enable = mkEnableOption (lib.mdDoc
-        "configuration of swaynag, a lightweight error bar for sway");
+      enable = mkEnableOption
+        "configuration of swaynag, a lightweight error bar for sway";
 
       settings = mkOption {
         type = types.attrsOf confFormat;
         default = { };
-        description = lib.mdDoc ''
+        description = ''
           Configuration written to
           {file}`$XDG_CONFIG_HOME/swaynag/config`.
 
diff --git a/modules/services/window-managers/spectrwm.nix b/modules/services/window-managers/spectrwm.nix
index 1fd7faba5..5561759b8 100644
--- a/modules/services/window-managers/spectrwm.nix
+++ b/modules/services/window-managers/spectrwm.nix
@@ -30,13 +30,13 @@ in {
 
   options = {
     xsession.windowManager.spectrwm = {
-      enable = mkEnableOption (lib.mdDoc "Spectrwm window manager");
+      enable = mkEnableOption "Spectrwm window manager";
 
       package = mkOption {
         type = types.package;
         default = pkgs.spectrwm;
         defaultText = literalExpression "pkgs.spectrwm";
-        description = lib.mdDoc ''
+        description = ''
           Package providing the {command}`spectrwm` command.
         '';
       };
@@ -52,7 +52,7 @@ in {
             focus_close = "next";
           }
         '';
-        description = lib.mdDoc "Spectrwm settings.";
+        description = "Spectrwm settings.";
       };
 
       bindings = mkOption {
@@ -65,7 +65,7 @@ in {
             quit = "Mod+Shift+q";
           }
         '';
-        description = lib.mdDoc "Spectrwm keybindings.";
+        description = "Spectrwm keybindings.";
       };
 
       unbindings = mkOption {
@@ -81,7 +81,7 @@ in {
             "MOD+t"
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           List of keybindings to disable from default Spectrwm configuration.
         '';
       };
@@ -95,7 +95,7 @@ in {
             search = "dmenu -ip -p 'Window name/id:';
           }
         '';
-        description = lib.mdDoc "Spectrwm programs variables.";
+        description = "Spectrwm programs variables.";
       };
 
       quirks = mkOption {
@@ -107,7 +107,7 @@ in {
             Pavucontrol = "FLOAT";
           }
         '';
-        description = lib.mdDoc "Spectrwm quicks (custom window rules).";
+        description = "Spectrwm quicks (custom window rules).";
       };
     };
   };
diff --git a/modules/services/window-managers/xmonad.nix b/modules/services/window-managers/xmonad.nix
index 235b885d9..59b403d30 100644
--- a/modules/services/window-managers/xmonad.nix
+++ b/modules/services/window-managers/xmonad.nix
@@ -18,13 +18,13 @@ let
 in {
   options = {
     xsession.windowManager.xmonad = {
-      enable = mkEnableOption (lib.mdDoc "xmonad window manager");
+      enable = mkEnableOption "xmonad window manager";
 
       haskellPackages = mkOption {
         default = pkgs.haskellPackages;
         defaultText = literalExpression "pkgs.haskellPackages";
         example = literalExpression "pkgs.haskell.packages.ghc784";
-        description = lib.mdDoc ''
+        description = ''
           The {var}`haskellPackages` used to build xmonad
           and other packages. This can be used to change the GHC
           version used to build xmonad and the packages listed in
@@ -41,7 +41,7 @@ in {
             haskellPackages.monad-logger
           ]
         '';
-        description = lib.mdDoc ''
+        description = ''
           Extra packages available to GHC when rebuilding xmonad. The
           value must be a function which receives the attribute set
           defined in {var}`haskellPackages` as the sole
@@ -52,7 +52,7 @@ in {
       enableContribAndExtras = mkOption {
         default = false;
         type = types.bool;
-        description = lib.mdDoc "Enable xmonad-{contrib,extras} in xmonad.";
+        description = "Enable xmonad-{contrib,extras} in xmonad.";
       };
 
       config = mkOption {
@@ -68,7 +68,7 @@ in {
                 }
           '''
         '';
-        description = lib.mdDoc ''
+        description = ''
           The configuration file to be used for xmonad. This must be
           an absolute path or `null` in which case
           {file}`~/.xmonad/xmonad.hs` will not be managed
@@ -91,7 +91,7 @@ in {
              ''';
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Additional files that will be saved in
           {file}`~/.xmonad/lib/` and included in the configuration
           build. The keys are the file names while the values are paths to the
diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix
index 8c42dc80b..3bc3f2f74 100644
--- a/modules/services/wlsunset.nix
+++ b/modules/services/wlsunset.nix
@@ -8,20 +8,20 @@ in {
   meta.maintainers = [ hm.maintainers.matrss ];
 
   options.services.wlsunset = {
-    enable = mkEnableOption (lib.mdDoc "wlsunset");
+    enable = mkEnableOption "wlsunset";
 
     package = mkOption {
       type = types.package;
       default = pkgs.wlsunset;
       defaultText = "pkgs.wlsunset";
-      description = lib.mdDoc ''
+      description = ''
         wlsunset derivation to use.
       '';
     };
 
     latitude = mkOption {
       type = types.str;
-      description = lib.mdDoc ''
+      description = ''
         Your current latitude, between `-90.0` and
         `90.0`.
       '';
@@ -29,7 +29,7 @@ in {
 
     longitude = mkOption {
       type = types.str;
-      description = lib.mdDoc ''
+      description = ''
         Your current longitude, between `-180.0` and
         `180.0`.
       '';
@@ -39,7 +39,7 @@ in {
       day = mkOption {
         type = types.int;
         default = 6500;
-        description = lib.mdDoc ''
+        description = ''
           Colour temperature to use during the day, in Kelvin (K).
           This value must be greater than `temperature.night`.
         '';
@@ -48,7 +48,7 @@ in {
       night = mkOption {
         type = types.int;
         default = 4000;
-        description = lib.mdDoc ''
+        description = ''
           Colour temperature to use during the night, in Kelvin (K).
           This value must be smaller than `temperature.day`.
         '';
@@ -58,7 +58,7 @@ in {
     gamma = mkOption {
       type = types.str;
       default = "1.0";
-      description = lib.mdDoc ''
+      description = ''
         Gamma value to use.
       '';
     };
@@ -66,7 +66,7 @@ in {
     systemdTarget = mkOption {
       type = types.str;
       default = "graphical-session.target";
-      description = lib.mdDoc ''
+      description = ''
         Systemd target to bind to.
       '';
     };
diff --git a/modules/services/xcape.nix b/modules/services/xcape.nix
index dac73f1e1..130db65b5 100644
--- a/modules/services/xcape.nix
+++ b/modules/services/xcape.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     services.xcape = {
-      enable = mkEnableOption (lib.mdDoc "xcape");
+      enable = mkEnableOption "xcape";
 
       timeout = mkOption {
         type = types.nullOr types.int;
         default = null;
         example = 500;
-        description = lib.mdDoc ''
+        description = ''
           If you hold a key longer than this timeout, xcape will not
           generate a key event. Default is 500 ms.
         '';
@@ -30,7 +30,7 @@ in {
           Shift_L = "Escape";
           Control_L = "Control_L|O";
         };
-        description = lib.mdDoc ''
+        description = ''
           The value has the grammar `Key[|OtherKey]`.
 
           The list of key names is found in the header file
diff --git a/modules/services/xembed-sni-proxy.nix b/modules/services/xembed-sni-proxy.nix
index 5a667ee17..e0b1f8464 100644
--- a/modules/services/xembed-sni-proxy.nix
+++ b/modules/services/xembed-sni-proxy.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     services.xembed-sni-proxy = {
-      enable = mkEnableOption (lib.mdDoc "XEmbed SNI Proxy");
+      enable = mkEnableOption "XEmbed SNI Proxy";
 
       package = mkOption {
         type = types.package;
         default = pkgs.plasma-workspace;
         defaultText = literalExpression "pkgs.plasma-workspace";
-        description = lib.mdDoc ''
+        description = ''
           Package containing the {command}`xembedsniproxy`
           program.
         '';
diff --git a/modules/services/xidlehook.nix b/modules/services/xidlehook.nix
index 83bad198b..2ce64e691 100644
--- a/modules/services/xidlehook.nix
+++ b/modules/services/xidlehook.nix
@@ -33,13 +33,13 @@ in {
   meta.maintainers = [ maintainers.dschrempf hm.maintainers.bertof ];
 
   options.services.xidlehook = {
-    enable = mkEnableOption (lib.mdDoc "xidlehook systemd service");
+    enable = mkEnableOption "xidlehook systemd service";
 
     package = mkOption {
       type = types.package;
       default = pkgs.xidlehook;
       defaultText = "pkgs.xidlehook";
-      description = lib.mdDoc "The package to use for xidlehook.";
+      description = "The package to use for xidlehook.";
     };
 
     environment = mkOption {
@@ -50,31 +50,30 @@ in {
           "primary-display" = "$(xrandr | awk '/ primary/{print $1}')";
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         Extra environment variables to be exported in the script.
         These options are passed unescaped as `export name=value`.
       '';
     };
 
-    detect-sleep = mkEnableOption (lib.mdDoc
-      "detecting when the system wakes up from a suspended state and resetting the idle timer");
+    detect-sleep = mkEnableOption
+      "detecting when the system wakes up from a suspended state and resetting the idle timer";
 
     not-when-fullscreen = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description =
-        lib.mdDoc "Disable locking when a fullscreen application is in use.";
+      description = "Disable locking when a fullscreen application is in use.";
     };
 
     not-when-audio = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc "Disable locking when audio is playing.";
+      description = "Disable locking when audio is playing.";
     };
 
-    once = mkEnableOption (lib.mdDoc "running the program once and exiting");
+    once = mkEnableOption "running the program once and exiting";
 
     timers = mkOption {
       type = types.listOf (types.submodule {
@@ -82,14 +81,14 @@ in {
           delay = mkOption {
             type = types.ints.unsigned;
             example = 60;
-            description = lib.mdDoc "Time before executing the command.";
+            description = "Time before executing the command.";
           };
           command = mkOption {
             type = types.nullOr types.str;
             example = literalExpression ''
               ''${pkgs.libnotify}/bin/notify-send "Idle" "Sleeping in 1 minute"
             '';
-            description = lib.mdDoc ''
+            description = ''
               Command executed after the idle timeout is reached.
               Path to executables are accepted.
               The command is automatically escaped.
@@ -101,7 +100,7 @@ in {
             example = literalExpression ''
               ''${pkgs.libnotify}/bin/notify-send "Idle" "Resuming activity"
             '';
-            description = lib.mdDoc ''
+            description = ''
               Command executed when the user becomes active again.
               This is only executed if the next timer has not been reached.
               Path to executables are accepted.
@@ -126,7 +125,7 @@ in {
           }
         ]
       '';
-      description = lib.mdDoc ''
+      description = ''
         A set of commands to be executed after a specific idle timeout.
         The commands specified in `command` and `canceller`
         are passed escaped to the script.
diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver.nix
index 569b572f5..3ae92658f 100644
--- a/modules/services/xscreensaver.nix
+++ b/modules/services/xscreensaver.nix
@@ -11,7 +11,7 @@ in {
 
   options = {
     services.xscreensaver = {
-      enable = mkEnableOption (lib.mdDoc "XScreenSaver");
+      enable = mkEnableOption "XScreenSaver";
 
       settings = mkOption {
         type = with types; attrsOf (either bool (either int str));
@@ -21,7 +21,7 @@ in {
           lock = false;
           fadeTicks = 20;
         };
-        description = lib.mdDoc ''
+        description = ''
           The settings to use for XScreenSaver.
         '';
       };
diff --git a/modules/services/xsettingsd.nix b/modules/services/xsettingsd.nix
index 8074a5788..c949676fa 100644
--- a/modules/services/xsettingsd.nix
+++ b/modules/services/xsettingsd.nix
@@ -25,13 +25,13 @@ in {
 
   options = {
     services.xsettingsd = {
-      enable = mkEnableOption (lib.mdDoc "xsettingsd");
+      enable = mkEnableOption "xsettingsd";
 
       package = mkOption {
         type = types.package;
         default = pkgs.xsettingsd;
         defaultText = literalExpression "pkgs.xsettingsd";
-        description = lib.mdDoc ''
+        description = ''
           Package containing the {command}`xsettingsd` program.
         '';
       };
@@ -47,7 +47,7 @@ in {
             "Xft/RGBA" = "rgb";
           }
         '';
-        description = lib.mdDoc ''
+        description = ''
           Xsettingsd options for configuration file. See
           <https://github.com/derat/xsettingsd/wiki/Settings>
           for documentation on these values.
diff --git a/modules/services/xsuspender.nix b/modules/services/xsuspender.nix
index c52ec9e3b..058f15471 100644
--- a/modules/services/xsuspender.nix
+++ b/modules/services/xsuspender.nix
@@ -11,44 +11,43 @@ let
   xsuspenderOptions = types.submodule {
     options = {
       matchWmClassContains = mkOption {
-        description = lib.mdDoc "Match windows that wm class contains string.";
+        description = "Match windows that wm class contains string.";
         type = types.nullOr types.str;
         default = null;
       };
 
       matchWmClassGroupContains = mkOption {
-        description =
-          lib.mdDoc "Match windows where wm class group contains string.";
+        description = "Match windows where wm class group contains string.";
         type = types.nullOr types.str;
         default = null;
       };
 
       matchWmNameContains = mkOption {
-        description = lib.mdDoc "Match windows where wm name contains string.";
+        description = "Match windows where wm name contains string.";
         type = types.nullOr types.str;
         default = null;
       };
 
       suspendDelay = mkOption {
-        description = lib.mdDoc "Initial suspend delay in seconds.";
+        description = "Initial suspend delay in seconds.";
         type = types.int;
         default = 5;
       };
 
       resumeEvery = mkOption {
-        description = lib.mdDoc "Resume interval in seconds.";
+        description = "Resume interval in seconds.";
         type = types.int;
         default = 50;
       };
 
       resumeFor = mkOption {
-        description = lib.mdDoc "Resume duration in seconds.";
+        description = "Resume duration in seconds.";
         type = types.int;
         default = 5;
       };
 
       execSuspend = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Before suspending, execute this shell script. If it fails,
           abort suspension.
         '';
@@ -58,7 +57,7 @@ let
       };
 
       execResume = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Before resuming, execute this shell script. Resume the
           process regardless script failure.
         '';
@@ -68,7 +67,7 @@ let
       };
 
       sendSignals = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Whether to send SIGSTOP / SIGCONT signals or not.
           If false just the exec scripts are run.
         '';
@@ -78,20 +77,19 @@ let
 
       suspendSubtreePattern = mkOption {
         description =
-          lib.mdDoc "Also suspend descendant processes that match this regex.";
+          "Also suspend descendant processes that match this regex.";
         type = types.nullOr types.str;
         default = null;
       };
 
       onlyOnBattery = mkOption {
-        description =
-          lib.mdDoc "Whether to enable process suspend only on battery.";
+        description = "Whether to enable process suspend only on battery.";
         type = types.bool;
         default = false;
       };
 
       autoSuspendOnBattery = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Whether to auto-apply rules when switching to battery
           power even if the window(s) didn't just lose focus.
         '';
@@ -100,7 +98,7 @@ let
       };
 
       downclockOnBattery = mkOption {
-        description = lib.mdDoc ''
+        description = ''
           Limit CPU consumption for this factor when on battery power.
           Value 1 means 50% decrease, 2 means 66%, 3 means 75% etc.
         '';
@@ -115,16 +113,16 @@ in {
 
   options = {
     services.xsuspender = {
-      enable = mkEnableOption (lib.mdDoc "XSuspender");
+      enable = mkEnableOption "XSuspender";
 
       defaults = mkOption {
-        description = lib.mdDoc "XSuspender defaults.";
+        description = "XSuspender defaults.";
         type = xsuspenderOptions;
         default = { };
       };
 
       rules = mkOption {
-        description = lib.mdDoc "Attribute set of XSuspender rules.";
+        description = "Attribute set of XSuspender rules.";
         type = types.attrsOf xsuspenderOptions;
         default = { };
         example = {
@@ -137,7 +135,7 @@ in {
       };
 
       debug = mkOption {
-        description = lib.mdDoc "Whether to enable debug output.";
+        description = "Whether to enable debug output.";
         type = types.bool;
         default = false;
       };
diff --git a/modules/systemd.nix b/modules/systemd.nix
index c83d4ddac..22490218e 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -96,7 +96,7 @@ in {
         default = "${pkgs.systemd}/bin/systemctl";
         defaultText = literalExpression ''"''${pkgs.systemd}/bin/systemctl"'';
         type = types.str;
-        description = lib.mdDoc ''
+        description = ''
           Absolute path to the {command}`systemctl` tool. This
           option may need to be set if running Home Manager on a
           non-NixOS distribution.
@@ -106,56 +106,56 @@ in {
       services = mkOption {
         default = { };
         type = unitType "service";
-        description = lib.mdDoc (unitDescription "service");
+        description = (unitDescription "service");
         example = unitExample "Service";
       };
 
       slices = mkOption {
         default = { };
         type = unitType "slice";
-        description = lib.mdDoc (unitDescription "slice");
+        description = (unitDescription "slice");
         example = unitExample "Slice";
       };
 
       sockets = mkOption {
         default = { };
         type = unitType "socket";
-        description = lib.mdDoc (unitDescription "socket");
+        description = (unitDescription "socket");
         example = unitExample "Socket";
       };
 
       targets = mkOption {
         default = { };
         type = unitType "target";
-        description = lib.mdDoc (unitDescription "target");
+        description = (unitDescription "target");
         example = unitExample "Target";
       };
 
       timers = mkOption {
         default = { };
         type = unitType "timer";
-        description = lib.mdDoc (unitDescription "timer");
+        description = (unitDescription "timer");
         example = unitExample "Timer";
       };
 
       paths = mkOption {
         default = { };
         type = unitType "path";
-        description = lib.mdDoc (unitDescription "path");
+        description = (unitDescription "path");
         example = unitExample "Path";
       };
 
       mounts = mkOption {
         default = { };
         type = unitType "mount";
-        description = lib.mdDoc (unitDescription "mount");
+        description = (unitDescription "mount");
         example = unitExample "Mount";
       };
 
       automounts = mkOption {
         default = { };
         type = unitType "automount";
-        description = lib.mdDoc (unitDescription "automount");
+        description = (unitDescription "automount");
         example = unitExample "Automount";
       };
 
@@ -164,7 +164,7 @@ in {
         type = with types;
           either bool (enum [ "suggest" "legacy" "sd-switch" ]);
         apply = p: if isBool p then if p then "legacy" else "suggest" else p;
-        description = lib.mdDoc ''
+        description = ''
           Whether new or changed services that are wanted by active targets
           should be started. Additionally, stop obsolete services from the
           previous generation.
@@ -193,7 +193,7 @@ in {
       servicesStartTimeoutMs = mkOption {
         default = 0;
         type = types.ints.unsigned;
-        description = lib.mdDoc ''
+        description = ''
           How long to wait for started services to fail until their start is
           considered successful. The value 0 indicates no timeout.
         '';
@@ -203,7 +203,7 @@ in {
         default = { };
         type = with types; attrsOf (either int str);
         example = { EDITOR = "vim"; };
-        description = lib.mdDoc ''
+        description = ''
           Environment variables that will be set for the user session.
           The variable values must be as described in
           {manpage}`environment.d(5)`.
diff --git a/modules/targets/darwin/keybindings.nix b/modules/targets/darwin/keybindings.nix
index 4184300d8..c4348333f 100644
--- a/modules/targets/darwin/keybindings.nix
+++ b/modules/targets/darwin/keybindings.nix
@@ -15,7 +15,7 @@ in {
       "^u" = "deleteToBeginningOfLine:";
       "^w" = "deleteWordBackward:";
     };
-    description = lib.mdDoc ''
+    description = ''
       This will configure the default keybindings for text fields in macOS
       applications. See
       [Apple's documentation](https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/EventOverview/TextDefaultsBindings/TextDefaultsBindings.html)
diff --git a/modules/targets/darwin/search.nix b/modules/targets/darwin/search.nix
index 75bce8f06..8e0df3b20 100644
--- a/modules/targets/darwin/search.nix
+++ b/modules/targets/darwin/search.nix
@@ -16,7 +16,7 @@ in {
   options.targets.darwin.search = mkOption {
     type = with types; nullOr (enum (attrNames searchEngines));
     default = null;
-    description = lib.mdDoc "Default search engine.";
+    description = "Default search engine.";
   };
 
   config = mkIf (cfg.search != null) {
diff --git a/modules/targets/darwin/user-defaults/default.nix b/modules/targets/darwin/user-defaults/default.nix
index 5c420cbc8..8d4e17a20 100644
--- a/modules/targets/darwin/user-defaults/default.nix
+++ b/modules/targets/darwin/user-defaults/default.nix
@@ -41,7 +41,7 @@ in {
         DSDontWriteUSBStores = true;
       };
     };
-    description = lib.mdDoc ''
+    description = ''
       Set macOS user defaults. Values set to `null` are
       ignored.
 
@@ -62,7 +62,7 @@ in {
     example = {
       "com.apple.controlcenter" = { BatteryShowPercentage = true; };
     };
-    description = lib.mdDoc ''
+    description = ''
       Set macOS user defaults. Unlike {option}`targets.darwin.defaults`,
       the preferences will only be applied to the currently logged-in host. This
       distinction is important for networked accounts.
diff --git a/modules/targets/darwin/user-defaults/opts-allhosts.nix b/modules/targets/darwin/user-defaults/opts-allhosts.nix
index e126494b0..820f05b3d 100644
--- a/modules/targets/darwin/user-defaults/opts-allhosts.nix
+++ b/modules/targets/darwin/user-defaults/opts-allhosts.nix
@@ -14,7 +14,7 @@ let
       type = with types; nullOr bool;
       default = null;
       example = true;
-      description = lib.mdDoc "Whether to enable ${name}.";
+      description = "Whether to enable ${name}.";
     };
 
   safari = config."com.apple.Safari";
@@ -26,26 +26,25 @@ in {
       AppleLanguages = mkNullableOption {
         type = with types; listOf str;
         example = [ "en" ];
-        description =
-          lib.mdDoc "Sets the language to use in the preferred order.";
+        description = "Sets the language to use in the preferred order.";
       };
 
       AppleLocale = mkNullableOption {
         type = types.str;
         example = "en_US";
-        description = lib.mdDoc "Configures the user locale.";
+        description = "Configures the user locale.";
       };
 
       AppleMeasurementUnits = mkNullableOption {
         type = types.enum [ "Centimeters" "Inches" ];
         example = "Centimeters";
-        description = lib.mdDoc "Sets the measurement unit.";
+        description = "Sets the measurement unit.";
       };
 
       AppleTemperatureUnit = mkNullableOption {
         type = types.enum [ "Celsius" "Fahrenheit" ];
         example = "Celsius";
-        description = lib.mdDoc "Sets the temperature unit.";
+        description = "Sets the temperature unit.";
       };
 
       AppleMetricUnits = mkNullableEnableOption "the metric system";
@@ -70,7 +69,7 @@ in {
       DSDontWriteNetworkStores = mkNullableOption {
         type = types.bool;
         example = false;
-        description = lib.mdDoc ''
+        description = ''
           Disable use of {file}`.DS_Store` files on network shares.
           See [the
           official article](https://support.apple.com/en-us/HT208209) for more info.
@@ -79,7 +78,7 @@ in {
       DSDontWriteUSBStores = mkNullableOption {
         type = types.bool;
         example = false;
-        description = lib.mdDoc ''
+        description = ''
           Disable use of {file}`.DS_Store` files on thumb drives.
         '';
       };
@@ -89,7 +88,7 @@ in {
       tilesize = mkNullableOption {
         type = types.int;
         example = 64;
-        description = lib.mdDoc "Sets the size of the dock.";
+        description = "Sets the size of the dock.";
       };
       size-immutable = mkNullableEnableOption "locking of the dock size";
       expose-group-apps = mkNullableEnableOption
@@ -99,7 +98,7 @@ in {
     "com.apple.menuextra.battery".ShowPercent = mkNullableOption {
       type = types.enum [ "YES" "NO" ];
       example = "NO";
-      description = lib.mdDoc ''
+      description = ''
         This option no longer works on macOS 11 and later. Instead, use
         {option}`targets.darwin.currentHostDefaults.\"com.apple.controlcenter\".BatteryShowPercentage`.
 
@@ -120,7 +119,7 @@ in {
 
       WebKitDeveloperExtrasEnabledPreferenceKey = mkNullableOption {
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Configures the web inspector.
 
           ::: {.warning}
@@ -131,7 +130,7 @@ in {
       };
       "WebKitPreferences.developerExtrasEnabled" = mkNullableOption {
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Configures the web inspector.
 
           ::: {.warning}
@@ -145,7 +144,7 @@ in {
     "com.apple.Safari.SandboxBroker" = {
       ShowDevelopMenu = mkNullableOption {
         type = types.bool;
-        description = lib.mdDoc ''
+        description = ''
           Show the "Develop" menu in Safari's menubar.
 
           ::: {.warning}
@@ -169,7 +168,7 @@ in {
       OpenTmuxWindowsIn = mkNullableOption {
         type = types.int;
         example = 2;
-        description = lib.mdDoc ''
+        description = ''
           Configures how to restore tmux windows when attaching to a session.
 
           **Possible Values**
diff --git a/modules/targets/darwin/user-defaults/opts-currenthost.nix b/modules/targets/darwin/user-defaults/opts-currenthost.nix
index 678f0c0c3..129f91487 100644
--- a/modules/targets/darwin/user-defaults/opts-currenthost.nix
+++ b/modules/targets/darwin/user-defaults/opts-currenthost.nix
@@ -12,7 +12,7 @@ let
       type = with lib.types; nullOr bool;
       default = null;
       example = true;
-      description = lib.mdDoc "Whether to enable ${name}.";
+      description = "Whether to enable ${name}.";
     };
 in {
   freeformType = with lib.types; attrsOf (attrsOf anything);
@@ -21,7 +21,7 @@ in {
     "com.apple.controlcenter".BatteryShowPercentage = mkNullableOption {
       type = lib.types.bool;
       example = true;
-      description = lib.mdDoc ''
+      description = ''
         Whether to show battery percentage in the menu bar.
       '';
     };
diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix
index 38d502c73..b5a07d5fa 100644
--- a/modules/targets/generic-linux.nix
+++ b/modules/targets/generic-linux.nix
@@ -20,8 +20,8 @@ in {
   ];
 
   options.targets.genericLinux = {
-    enable = mkEnableOption (lib.mdDoc "") // {
-      description = lib.mdDoc ''
+    enable = mkEnableOption "" // {
+      description = ''
         Whether to enable settings that make Home Manager work better on
         GNU/Linux distributions other than NixOS.
       '';
diff --git a/modules/xresources.nix b/modules/xresources.nix
index 5e1104654..e4ba0e47e 100644
--- a/modules/xresources.nix
+++ b/modules/xresources.nix
@@ -43,7 +43,7 @@ in {
           "XTerm*charClass" = [ "37:48" "45-47:48" "58:48" "64:48" "126:48" ];
         }
       '';
-      description = lib.mdDoc ''
+      description = ''
         X server resources that should be set.
         Booleans are formatted as "true" or "false" respectively.
         List elements are recursively formatted as a string and joined by commas.
@@ -68,7 +68,7 @@ in {
             } + "/Xresources.dark"
         )
       '';
-      description = lib.mdDoc ''
+      description = ''
         Additional X server resources contents.
         If this and all other xresources options are
         `null`, then this feature is disabled and no
@@ -80,7 +80,7 @@ in {
       type = types.str;
       default = "${config.home.homeDirectory}/.Xresources";
       defaultText = "$HOME/.Xresources";
-      description = lib.mdDoc
+      description =
         "Path where Home Manager should link the {file}`.Xresources` file.";
     };
   };
diff --git a/modules/xsession.nix b/modules/xsession.nix
index 6ab5f4170..d8e2a71c2 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -11,13 +11,13 @@ in {
 
   options = {
     xsession = {
-      enable = mkEnableOption (lib.mdDoc "X Session");
+      enable = mkEnableOption "X Session";
 
       scriptPath = mkOption {
         type = types.str;
         default = ".xsession";
         example = ".xsession-hm";
-        description = lib.mdDoc ''
+        description = ''
           Path, relative to {env}`HOME`, where Home Manager
           should write the X session script.
         '';
@@ -27,7 +27,7 @@ in {
         type = types.str;
         default = ".xprofile";
         example = ".xprofile-hm";
-        description = lib.mdDoc ''
+        description = ''
           Path, relative to {env}`HOME`, where Home Manager
           should write the X profile script.
         '';
@@ -44,7 +44,7 @@ in {
             "''${xmonad}/bin/xmonad";
         '';
         default = ''test -n "$1" && eval "$@"'';
-        description = lib.mdDoc ''
+        description = ''
           Command to use to start the window manager.
 
           The default value allows integration with NixOS' generated xserver configuration.
@@ -57,7 +57,7 @@ in {
         type = types.bool;
         default = false;
         example = true;
-        description = lib.mdDoc ''
+        description = ''
           Whether tray applets should prefer using the Status Notifier
           Items (SNI) protocol, commonly called App Indicators. Note,
           not all tray applets or status bars support SNI.
@@ -67,15 +67,13 @@ in {
       profileExtra = mkOption {
         type = types.lines;
         default = "";
-        description =
-          lib.mdDoc "Extra shell commands to run before session start.";
+        description = "Extra shell commands to run before session start.";
       };
 
       initExtra = mkOption {
         type = types.lines;
         default = "";
-        description =
-          lib.mdDoc "Extra shell commands to run during initialization.";
+        description = "Extra shell commands to run during initialization.";
       };
 
       importedVariables = mkOption {
@@ -83,7 +81,7 @@ in {
         apply = unique;
         example = [ "GDK_PIXBUF_ICON_LOADER" ];
         visible = false;
-        description = lib.mdDoc ''
+        description = ''
           Environment variables to import into the user systemd
           session. The will be available for use by graphical
           services.
diff --git a/nixos/common.nix b/nixos/common.nix
index 0c7663f51..38c5aabb4 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -43,20 +43,20 @@ let
 
 in {
   options.home-manager = {
-    useUserPackages = mkEnableOption (mdDoc ''
+    useUserPackages = mkEnableOption ''
       installation of user packages through the
-      {option}`users.users.<name>.packages` option'');
+      {option}`users.users.<name>.packages` option'';
 
-    useGlobalPkgs = mkEnableOption (mdDoc ''
+    useGlobalPkgs = mkEnableOption ''
       using the system configuration's `pkgs`
       argument in Home Manager. This disables the Home Manager
-      options {option}`nixpkgs.*`'');
+      options {option}`nixpkgs.*`'';
 
     backupFileExtension = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "backup";
-      description = mdDoc ''
+      description = ''
         On activation move existing files by appending the given
         file extension rather than exiting with an error.
       '';
@@ -66,7 +66,7 @@ in {
       type = types.attrs;
       default = { };
       example = literalExpression "{ inherit emacs-overlay; }";
-      description = mdDoc ''
+      description = ''
         Extra `specialArgs` passed to Home Manager. This
         option can be used to pass additional arguments to all modules.
       '';
@@ -76,19 +76,19 @@ in {
       type = with types; listOf raw;
       default = [ ];
       example = literalExpression "[ { home.packages = [ nixpkgs-fmt ]; } ]";
-      description = mdDoc ''
+      description = ''
         Extra modules added to all users.
       '';
     };
 
-    verbose = mkEnableOption (lib.mdDoc "verbose output on activation");
+    verbose = mkEnableOption "verbose output on activation";
 
     users = mkOption {
       type = types.attrsOf hmModule;
       default = { };
       # Prevent the entire submodule being included in the documentation.
       visible = "shallow";
-      description = mdDoc ''
+      description = ''
         Per-user Home Manager configuration.
       '';
     };
diff --git a/tests/asserts.nix b/tests/asserts.nix
index a72f1b9b4..c1fe177ee 100644
--- a/tests/asserts.nix
+++ b/tests/asserts.nix
@@ -8,13 +8,13 @@ with lib;
       enable = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Whether warning asserts are enabled.";
+        description = "Whether warning asserts are enabled.";
       };
 
       expected = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           List of expected warnings.
         '';
       };
@@ -24,13 +24,13 @@ with lib;
       enable = mkOption {
         type = types.bool;
         default = true;
-        description = lib.mdDoc "Whether assertion asserts are enabled.";
+        description = "Whether assertion asserts are enabled.";
       };
 
       expected = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = lib.mdDoc ''
+        description = ''
           List of expected assertions.
         '';
       };
diff --git a/tests/big-test.nix b/tests/big-test.nix
index 6a93bd07f..5396f170e 100644
--- a/tests/big-test.nix
+++ b/tests/big-test.nix
@@ -4,7 +4,7 @@
   options.test.enableBig = lib.mkOption {
     type = lib.types.bool;
     default = true;
-    description = lib.mdDoc ''
+    description = ''
       Whether to enable "big" tests. These are tests that require
       more resources than typical tests. For example, tests that depend on large
       packages or tests that take long to run.
diff --git a/tests/stubs.nix b/tests/stubs.nix
index 73d5252d4..5dee8e43a 100644
--- a/tests/stubs.nix
+++ b/tests/stubs.nix
@@ -9,7 +9,7 @@ let
       name = mkOption {
         type = types.str;
         default = "dummy";
-        description = lib.mdDoc "The stub package name.";
+        description = "The stub package name.";
       };
 
       outPath = mkOption {
@@ -60,7 +60,7 @@ in {
     type = types.attrsOf stubType;
     default = { };
     description =
-      lib.mdDoc "Package attributes that should be replaced by a stub package.";
+      "Package attributes that should be replaced by a stub package.";
   };
 
   config = {