diff --git a/modules/programs/aerc.nix b/modules/programs/aerc.nix
index 78f5bd661..9f3cf76ef 100644
--- a/modules/programs/aerc.nix
+++ b/modules/programs/aerc.nix
@@ -33,7 +33,7 @@ in {
 
     enable = mkEnableOption "aerc";
 
-    package = mkPackageOption pkgs "aerc" { };
+    package = mkPackageOptionMD pkgs "aerc" { };
 
     extraAccounts = mkOption {
       type = sectionsOrLines;
diff --git a/modules/programs/antidote.nix b/modules/programs/antidote.nix
index f1fa044ce..e90c99034 100644
--- a/modules/programs/antidote.nix
+++ b/modules/programs/antidote.nix
@@ -30,7 +30,7 @@ in {
 
     useFriendlyNames = mkEnableOption "friendly names";
 
-    package = mkPackageOption pkgs "antidote" { };
+    package = mkPackageOptionMD pkgs "antidote" { };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix
index 5e84edbe6..299833636 100644
--- a/modules/programs/borgmatic.nix
+++ b/modules/programs/borgmatic.nix
@@ -182,7 +182,7 @@ in {
     programs.borgmatic = {
       enable = mkEnableOption "Borgmatic";
 
-      package = mkPackageOption pkgs "borgmatic" { };
+      package = mkPackageOptionMD pkgs "borgmatic" { };
 
       backups = mkOption {
         type = types.attrsOf configModule;
diff --git a/modules/programs/boxxy.nix b/modules/programs/boxxy.nix
index 566a11e7e..b6d68f544 100644
--- a/modules/programs/boxxy.nix
+++ b/modules/programs/boxxy.nix
@@ -84,7 +84,7 @@ in {
   options.programs.boxxy = {
     enable = mkEnableOption "boxxy: Boxes in badly behaving applications";
 
-    package = mkPackageOption pkgs "boxxy" { };
+    package = mkPackageOptionMD pkgs "boxxy" { };
 
     rules = mkOption {
       type = types.listOf boxxyRulesOpts;
diff --git a/modules/programs/btop.nix b/modules/programs/btop.nix
index cdf011e79..2bee9125f 100644
--- a/modules/programs/btop.nix
+++ b/modules/programs/btop.nix
@@ -30,7 +30,7 @@ in {
   options.programs.btop = {
     enable = mkEnableOption "btop";
 
-    package = mkPackageOption pkgs "btop" { };
+    package = mkPackageOptionMD pkgs "btop" { };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool float int str ]);
diff --git a/modules/programs/comodoro.nix b/modules/programs/comodoro.nix
index 5c9fa358f..c7b8ea007 100644
--- a/modules/programs/comodoro.nix
+++ b/modules/programs/comodoro.nix
@@ -10,7 +10,7 @@ in {
   options.programs.comodoro = {
     enable = lib.mkEnableOption "Comodoro, a CLI to manage your time";
 
-    package = lib.mkPackageOption pkgs "comodoro" { };
+    package = lib.mkPackageOptionMD pkgs "comodoro" { };
 
     settings = lib.mkOption {
       type = lib.types.submodule { freeformType = tomlFormat.type; };
diff --git a/modules/programs/discocss.nix b/modules/programs/discocss.nix
index 5a35f187f..bc0aebd22 100644
--- a/modules/programs/discocss.nix
+++ b/modules/programs/discocss.nix
@@ -11,9 +11,9 @@ in {
       enable = mkEnableOption
         "discocss, a tiny Discord CSS injector for Linux and MacOS";
 
-      package = mkPackageOption pkgs "discocss" { };
+      package = mkPackageOptionMD pkgs "discocss" { };
 
-      discordPackage = mkPackageOption pkgs "discord" { };
+      discordPackage = mkPackageOptionMD pkgs "discord" { };
 
       discordAlias = mkOption {
         type = types.bool;
diff --git a/modules/programs/exa.nix b/modules/programs/exa.nix
index 44a1fb58c..867a74efb 100644
--- a/modules/programs/exa.nix
+++ b/modules/programs/exa.nix
@@ -36,7 +36,7 @@ with lib;
       '';
     };
 
-    package = mkPackageOption pkgs "exa" { };
+    package = mkPackageOptionMD pkgs "exa" { };
   };
 
   config = let
diff --git a/modules/programs/feh.nix b/modules/programs/feh.nix
index 15aac1751..459c60a5f 100644
--- a/modules/programs/feh.nix
+++ b/modules/programs/feh.nix
@@ -27,7 +27,7 @@ in {
   options.programs.feh = {
     enable = mkEnableOption "feh - a fast and light image viewer";
 
-    package = mkPackageOption pkgs "feh" { };
+    package = mkPackageOptionMD pkgs "feh" { };
 
     buttons = mkOption {
       default = { };
diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix
index aff97cf1e..e8205e93b 100644
--- a/modules/programs/fuzzel.nix
+++ b/modules/programs/fuzzel.nix
@@ -2,7 +2,8 @@
 
 let
 
-  inherit (lib) literalExpression mkEnableOption mkPackageOption mkOption mkIf;
+  inherit (lib)
+    literalExpression mkEnableOption mkPackageOptionMD mkOption mkIf;
 
   cfg = config.programs.fuzzel;
 
@@ -14,7 +15,7 @@ in {
   options.programs.fuzzel = {
     enable = mkEnableOption "fuzzel";
 
-    package = mkPackageOption pkgs "fuzzel" { };
+    package = mkPackageOptionMD pkgs "fuzzel" { };
 
     settings = mkOption {
       type = iniFormat.type;
diff --git a/modules/programs/git-cliff.nix b/modules/programs/git-cliff.nix
index 7894ec6c6..e9460d51d 100644
--- a/modules/programs/git-cliff.nix
+++ b/modules/programs/git-cliff.nix
@@ -13,7 +13,7 @@ in {
   options.programs.git-cliff = {
     enable = mkEnableOption "git-cliff changelog generator";
 
-    package = mkPackageOption pkgs "git-cliff" { };
+    package = mkPackageOptionMD pkgs "git-cliff" { };
 
     settings = mkOption {
       type = tomlFormat.type;
diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth.nix
index 4833e8068..8f260d098 100644
--- a/modules/programs/git-credential-oauth.nix
+++ b/modules/programs/git-credential-oauth.nix
@@ -11,7 +11,7 @@ in {
     programs.git-credential-oauth = {
       enable = lib.mkEnableOption "Git authentication handler for OAuth";
 
-      package = lib.mkPackageOption pkgs "git-credential-oauth" { };
+      package = lib.mkPackageOptionMD pkgs "git-credential-oauth" { };
     };
   };
 
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 5e6bbd725..40052d17c 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -310,7 +310,7 @@ in {
           '';
         };
 
-        package = mkPackageOption pkgs "delta" { };
+        package = mkPackageOptionMD pkgs "delta" { };
 
         options = mkOption {
           type = with types;
diff --git a/modules/programs/havoc.nix b/modules/programs/havoc.nix
index 6ae89c1d7..5e3cbe847 100644
--- a/modules/programs/havoc.nix
+++ b/modules/programs/havoc.nix
@@ -13,7 +13,7 @@ in {
   options.programs.havoc = {
     enable = mkEnableOption "Havoc terminal";
 
-    package = mkPackageOption pkgs "havoc" { };
+    package = mkPackageOptionMD pkgs "havoc" { };
 
     settings = mkOption {
       type = iniFormat.type;
diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix
index 0761c9bb8..a2b6cd0f4 100644
--- a/modules/programs/himalaya.nix
+++ b/modules/programs/himalaya.nix
@@ -119,7 +119,7 @@ in {
   options = {
     programs.himalaya = {
       enable = lib.mkEnableOption "the Himalaya email client";
-      package = lib.mkPackageOption pkgs "himalaya" { };
+      package = lib.mkPackageOptionMD pkgs "himalaya" { };
       settings = lib.mkOption {
         type = lib.types.submodule { freeformType = tomlFormat.type; };
         default = { };
diff --git a/modules/programs/hstr.nix b/modules/programs/hstr.nix
index e85832174..be247a60e 100644
--- a/modules/programs/hstr.nix
+++ b/modules/programs/hstr.nix
@@ -14,7 +14,7 @@ in {
       Bash And Zsh shell history suggest box - easily view, navigate, search and
       manage your command history'';
 
-    package = mkPackageOption pkgs "hstr" { };
+    package = mkPackageOptionMD pkgs "hstr" { };
 
     enableBashIntegration = mkEnableOption "Bash integration" // {
       default = true;
diff --git a/modules/programs/i3status.nix b/modules/programs/i3status.nix
index 5fd4f7417..d6abf27c1 100644
--- a/modules/programs/i3status.nix
+++ b/modules/programs/i3status.nix
@@ -139,7 +139,7 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "i3status" { };
+    package = mkPackageOptionMD pkgs "i3status" { };
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/programs/imv.nix b/modules/programs/imv.nix
index 2841b5a2b..348c4b2e6 100644
--- a/modules/programs/imv.nix
+++ b/modules/programs/imv.nix
@@ -16,7 +16,7 @@ in {
     enable = mkEnableOption
       "imv: a command line image viewer intended for use with tiling window managers";
 
-    package = mkPackageOption pkgs "imv" { };
+    package = mkPackageOptionMD pkgs "imv" { };
 
     settings = mkOption {
       default = { };
diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu.nix
index 6f40064b9..9c0ad6a1b 100644
--- a/modules/programs/jujutsu.nix
+++ b/modules/programs/jujutsu.nix
@@ -14,7 +14,7 @@ in {
     enable =
       mkEnableOption "a Git-compatible DVCS that is both simple and powerful";
 
-    package = mkPackageOption pkgs "jujutsu" { };
+    package = mkPackageOptionMD pkgs "jujutsu" { };
 
     settings = mkOption {
       type = tomlFormat.type;
diff --git a/modules/programs/k9s.nix b/modules/programs/k9s.nix
index 11ac2bfd3..f0d1a99e2 100644
--- a/modules/programs/k9s.nix
+++ b/modules/programs/k9s.nix
@@ -14,7 +14,7 @@ in {
     enable =
       mkEnableOption "k9s - Kubernetes CLI To Manage Your Clusters In Style";
 
-    package = mkPackageOption pkgs "k9s" { };
+    package = mkPackageOptionMD pkgs "k9s" { };
 
     settings = mkOption {
       type = yamlFormat.type;
diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix
index 55db23bd1..c963d2be1 100644
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@@ -622,7 +622,7 @@ in {
     programs.kakoune = {
       enable = mkEnableOption "the kakoune text editor";
 
-      package = mkPackageOption pkgs "kakoune-unwrapped" { };
+      package = mkPackageOptionMD pkgs "kakoune-unwrapped" { };
 
       config = mkOption {
         type = types.nullOr configModule;
diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix
index 7e7312be9..0c645cdca 100644
--- a/modules/programs/lazygit.nix
+++ b/modules/programs/lazygit.nix
@@ -16,7 +16,7 @@ in {
   options.programs.lazygit = {
     enable = mkEnableOption "lazygit, a simple terminal UI for git commands";
 
-    package = mkPackageOption pkgs "lazygit" { };
+    package = mkPackageOptionMD pkgs "lazygit" { };
 
     settings = mkOption {
       type = yamlFormat.type;
diff --git a/modules/programs/ledger.nix b/modules/programs/ledger.nix
index f5b591b24..d2538e1d4 100644
--- a/modules/programs/ledger.nix
+++ b/modules/programs/ledger.nix
@@ -21,7 +21,7 @@ in {
   options.programs.ledger = {
     enable = mkEnableOption "ledger, a double-entry accounting system";
 
-    package = mkPackageOption pkgs "ledger" { };
+    package = mkPackageOptionMD pkgs "ledger" { };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
diff --git a/modules/programs/looking-glass-client.nix b/modules/programs/looking-glass-client.nix
index 1c14282b9..7628c27ca 100644
--- a/modules/programs/looking-glass-client.nix
+++ b/modules/programs/looking-glass-client.nix
@@ -11,7 +11,7 @@ in {
   options.programs.looking-glass-client = {
     enable = mkEnableOption "looking-glass-client";
 
-    package = mkPackageOption pkgs "looking-glass-client" { };
+    package = mkPackageOptionMD pkgs "looking-glass-client" { };
 
     settings = mkOption {
       type = settingsFormat.type;
diff --git a/modules/programs/mr.nix b/modules/programs/mr.nix
index 2e02e7c62..ee1caf041 100644
--- a/modules/programs/mr.nix
+++ b/modules/programs/mr.nix
@@ -17,7 +17,7 @@ in {
     enable = mkEnableOption
       "mr, a tool to manage all your version control repositories";
 
-    package = mkPackageOption pkgs "mr" { };
+    package = mkPackageOptionMD pkgs "mr" { };
 
     settings = mkOption {
       type = iniFormat.type;
diff --git a/modules/programs/nheko.nix b/modules/programs/nheko.nix
index 53f670112..55b2616d1 100644
--- a/modules/programs/nheko.nix
+++ b/modules/programs/nheko.nix
@@ -24,7 +24,7 @@ in {
   options.programs.nheko = {
     enable = mkEnableOption "Qt desktop client for Matrix";
 
-    package = mkPackageOption pkgs "nheko" { };
+    package = mkPackageOptionMD pkgs "nheko" { };
 
     settings = mkOption {
       type = iniFmt.type;
diff --git a/modules/programs/offlineimap.nix b/modules/programs/offlineimap.nix
index 0cddb4f9b..954dab193 100644
--- a/modules/programs/offlineimap.nix
+++ b/modules/programs/offlineimap.nix
@@ -90,7 +90,7 @@ in {
     programs.offlineimap = {
       enable = mkEnableOption "OfflineIMAP";
 
-      package = mkPackageOption pkgs "offlineimap" {
+      package = mkPackageOptionMD pkgs "offlineimap" {
         example = ''
           pkgs.offlineimap.overridePythonAttrs ( old: {
             propagatedBuildInputs = old.propagatedBuildInputs
diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix
index d1dfda97f..a6b077010 100644
--- a/modules/programs/oh-my-posh.nix
+++ b/modules/programs/oh-my-posh.nix
@@ -20,7 +20,7 @@ in {
   options.programs.oh-my-posh = {
     enable = mkEnableOption "oh-my-posh, a prompt theme engine for any shell";
 
-    package = mkPackageOption pkgs "oh-my-posh" { };
+    package = mkPackageOptionMD pkgs "oh-my-posh" { };
 
     settings = mkOption {
       type = jsonFormat.type;
diff --git a/modules/programs/pls.nix b/modules/programs/pls.nix
index 5f4ab9da7..47216d4ee 100644
--- a/modules/programs/pls.nix
+++ b/modules/programs/pls.nix
@@ -19,7 +19,7 @@ in {
     enable =
       mkEnableOption "pls, a modern replacement for <command>ls</command>";
 
-    package = mkPackageOption pkgs "pls" { };
+    package = mkPackageOptionMD pkgs "pls" { };
 
     enableAliases = mkEnableOption "recommended pls aliases";
   };
diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv.nix
index e491cb81a..49c454e27 100644
--- a/modules/programs/rbenv.nix
+++ b/modules/programs/rbenv.nix
@@ -29,7 +29,7 @@ in {
   options.programs.rbenv = {
     enable = mkEnableOption "rbenv";
 
-    package = mkPackageOption pkgs "rbenv" { };
+    package = mkPackageOptionMD pkgs "rbenv" { };
 
     plugins = mkOption {
       type = types.listOf pluginModule;
diff --git a/modules/programs/ripgrep.nix b/modules/programs/ripgrep.nix
index 10bc1596b..f925e6e61 100644
--- a/modules/programs/ripgrep.nix
+++ b/modules/programs/ripgrep.nix
@@ -12,7 +12,7 @@ in {
     programs.ripgrep = {
       enable = mkEnableOption "Ripgrep";
 
-      package = mkPackageOption pkgs "ripgrep" { };
+      package = mkPackageOptionMD pkgs "ripgrep" { };
 
       arguments = mkOption {
         type = with types; listOf str;
diff --git a/modules/programs/rtx.nix b/modules/programs/rtx.nix
index bb1053335..b78000784 100644
--- a/modules/programs/rtx.nix
+++ b/modules/programs/rtx.nix
@@ -12,7 +12,7 @@ in {
     programs.rtx = {
       enable = mkEnableOption "RTX. Runtime Executor (asdf Rust clone)";
 
-      package = mkPackageOption pkgs "rtx" { };
+      package = mkPackageOptionMD pkgs "rtx" { };
 
       enableBashIntegration = mkEnableOption "Bash Integration" // {
         default = true;
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 2e29a03d5..50d6e4252 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -361,7 +361,7 @@ in
   options.programs.ssh = {
     enable = mkEnableOption "SSH client configuration";
 
-    package = mkPackageOption pkgs "openssh" {
+    package = mkPackageOptionMD pkgs "openssh" {
       nullable = true;
       default = null;
       extraDescription = "By default, the client provided by your system is used.";
diff --git a/modules/programs/swaylock.nix b/modules/programs/swaylock.nix
index 9299e6459..15b8d4478 100644
--- a/modules/programs/swaylock.nix
+++ b/modules/programs/swaylock.nix
@@ -19,7 +19,7 @@ in {
       description = "Whether to enable swaylock.";
     };
 
-    package = mkPackageOption pkgs "swaylock" { };
+    package = mkPackageOptionMD pkgs "swaylock" { };
 
     settings = mkOption {
       type = with types; attrsOf (oneOf [ bool float int str ]);
diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix
index 985b6285d..3d3e83f89 100644
--- a/modules/programs/taskwarrior.nix
+++ b/modules/programs/taskwarrior.nix
@@ -85,7 +85,7 @@ in {
         '';
       };
 
-      package = mkPackageOption pkgs "taskwarrior" { };
+      package = mkPackageOptionMD pkgs "taskwarrior" { };
     };
   };
 
diff --git a/modules/programs/vim-vint.nix b/modules/programs/vim-vint.nix
index e44d96e4c..c9fdf2563 100644
--- a/modules/programs/vim-vint.nix
+++ b/modules/programs/vim-vint.nix
@@ -14,7 +14,7 @@ in {
   options = {
     programs.vim-vint = {
       enable = mkEnableOption "the Vint linter for Vimscript";
-      package = mkPackageOption pkgs "vim-vint" { };
+      package = mkPackageOptionMD pkgs "vim-vint" { };
 
       settings = mkOption {
         type = yamlFormat.type;
diff --git a/modules/programs/wlogout.nix b/modules/programs/wlogout.nix
index 49e59b078..8ff7566d3 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 mkPackageOption mkOption;
+  inherit (lib.options) mkEnableOption mkPackageOptionMD mkOption;
   inherit (lib.modules) mkIf;
   inherit (lib.strings) concatMapStrings;
   inherit (builtins) toJSON;
@@ -72,7 +72,7 @@ in {
   options.programs.wlogout = with lib.types; {
     enable = mkEnableOption "wlogout";
 
-    package = mkPackageOption pkgs "wlogout" { };
+    package = mkPackageOptionMD pkgs "wlogout" { };
 
     layout = mkOption {
       type = listOf wlogoutLayoutConfig;
diff --git a/modules/programs/wofi.nix b/modules/programs/wofi.nix
index e1e84ba25..474f03ba9 100644
--- a/modules/programs/wofi.nix
+++ b/modules/programs/wofi.nix
@@ -17,7 +17,7 @@ in {
     enable = mkEnableOption
       "wofi: a launcher/menu program for wlroots based wayland compositors such as sway";
 
-    package = mkPackageOption pkgs "wofi" { };
+    package = mkPackageOptionMD pkgs "wofi" { };
 
     settings = mkOption {
       default = { };
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
index 221a57601..d2d9a7a5c 100644
--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@@ -142,7 +142,7 @@ let
     options = {
       enable = mkEnableOption "oh-my-zsh";
 
-      package = mkPackageOption pkgs "oh-my-zsh" { };
+      package = mkPackageOptionMD pkgs "oh-my-zsh" { };
 
       plugins = mkOption {
         default = [];
@@ -212,7 +212,7 @@ let
     options = {
       enable = mkEnableOption "zsh syntax highlighting";
 
-      package = mkPackageOption pkgs "zsh-syntax-highlighting" { };
+      package = mkPackageOptionMD pkgs "zsh-syntax-highlighting" { };
 
       styles = mkOption {
         type = types.attrsOf types.str;
@@ -236,7 +236,7 @@ in
     programs.zsh = {
       enable = mkEnableOption "Z shell (Zsh)";
 
-      package = mkPackageOption pkgs "zsh" { };
+      package = mkPackageOptionMD pkgs "zsh" { };
 
       autocd = mkOption {
         default = null;
diff --git a/modules/services/batsignal.nix b/modules/services/batsignal.nix
index 4f209f1e0..131eeb2f9 100644
--- a/modules/services/batsignal.nix
+++ b/modules/services/batsignal.nix
@@ -11,7 +11,7 @@ in {
     services.batsignal = {
       enable = lib.mkEnableOption "Batsignal Battery Daemon";
 
-      package = lib.mkPackageOption pkgs "batsignal" { };
+      package = lib.mkPackageOptionMD pkgs "batsignal" { };
 
       extraArgs = lib.mkOption {
         type = with lib.types; listOf str;
diff --git a/modules/services/cachix-agent.nix b/modules/services/cachix-agent.nix
index 01eca05b7..2f1e42cad 100644
--- a/modules/services/cachix-agent.nix
+++ b/modules/services/cachix-agent.nix
@@ -34,7 +34,7 @@ in {
       description = "Cachix URI to use.";
     };
 
-    package = mkPackageOption pkgs "cachix" { };
+    package = mkPackageOptionMD pkgs "cachix" { };
 
     credentialsFile = mkOption {
       type = types.path;
diff --git a/modules/services/clipman.nix b/modules/services/clipman.nix
index 6a177670e..9186c8b09 100644
--- a/modules/services/clipman.nix
+++ b/modules/services/clipman.nix
@@ -7,7 +7,7 @@ in {
   options.services.clipman = {
     enable = mkEnableOption "clipman, a simple clipboard manager for Wayland";
 
-    package = mkPackageOption pkgs "clipman" { };
+    package = mkPackageOptionMD pkgs "clipman" { };
 
     systemdTarget = mkOption {
       type = types.str;
diff --git a/modules/services/comodoro.nix b/modules/services/comodoro.nix
index cf298ce82..4458807b9 100644
--- a/modules/services/comodoro.nix
+++ b/modules/services/comodoro.nix
@@ -17,7 +17,7 @@ in {
   options.services.comodoro = {
     enable = lib.mkEnableOption "Comodoro server";
 
-    package = lib.mkPackageOption pkgs "comodoro" { };
+    package = lib.mkPackageOptionMD pkgs "comodoro" { };
 
     environment = lib.mkOption {
       type = with lib.types; attrsOf str;
diff --git a/modules/services/copyq.nix b/modules/services/copyq.nix
index 358185c0a..745ca0df0 100644
--- a/modules/services/copyq.nix
+++ b/modules/services/copyq.nix
@@ -11,7 +11,7 @@ in {
     enable =
       lib.mkEnableOption "CopyQ, a clipboard manager with advanced features";
 
-    package = lib.mkPackageOption pkgs "copyq" { };
+    package = lib.mkPackageOptionMD pkgs "copyq" { };
 
     systemdTarget = lib.mkOption {
       type = lib.types.str;
diff --git a/modules/services/listenbrainz-mpd.nix b/modules/services/listenbrainz-mpd.nix
index 5a6d20828..1ac25c6ad 100644
--- a/modules/services/listenbrainz-mpd.nix
+++ b/modules/services/listenbrainz-mpd.nix
@@ -2,7 +2,7 @@
 
 let
 
-  inherit (lib.options) mkEnableOption mkPackageOption mkOption;
+  inherit (lib.options) mkEnableOption mkPackageOptionMD mkOption;
   inherit (lib.modules) mkIf;
 
   cfg = config.services.listenbrainz-mpd;
@@ -15,7 +15,7 @@ in {
   options.services.listenbrainz-mpd = {
     enable = mkEnableOption "listenbrainz-mpd";
 
-    package = mkPackageOption pkgs "listenbrainz-mpd" { };
+    package = mkPackageOptionMD pkgs "listenbrainz-mpd" { };
 
     settings = mkOption {
       type = tomlFormat.type;
diff --git a/modules/services/megasync.nix b/modules/services/megasync.nix
index c519ba51f..283a72809 100644
--- a/modules/services/megasync.nix
+++ b/modules/services/megasync.nix
@@ -13,7 +13,7 @@ in {
     services.megasync = {
       enable = mkEnableOption "Megasync client";
 
-      package = mkPackageOption pkgs "megasync" { };
+      package = mkPackageOptionMD pkgs "megasync" { };
     };
   };
 
diff --git a/modules/services/mpd-mpris.nix b/modules/services/mpd-mpris.nix
index 681137f74..3a502d452 100644
--- a/modules/services/mpd-mpris.nix
+++ b/modules/services/mpd-mpris.nix
@@ -27,7 +27,7 @@ in {
     enable = lib.mkEnableOption
       "mpd-mpris: An implementation of the MPRIS protocol for MPD";
 
-    package = lib.mkPackageOption pkgs "mpd-mpris" { };
+    package = lib.mkPackageOptionMD pkgs "mpd-mpris" { };
 
     mpd = {
       useLocal = lib.mkOption {
diff --git a/modules/services/owncloud-client.nix b/modules/services/owncloud-client.nix
index 2884affe4..d9c69929a 100644
--- a/modules/services/owncloud-client.nix
+++ b/modules/services/owncloud-client.nix
@@ -11,7 +11,7 @@ in {
     services.owncloud-client = {
       enable = mkEnableOption "Owncloud Client";
 
-      package = mkPackageOption pkgs "owncloud-client" { };
+      package = mkPackageOptionMD pkgs "owncloud-client" { };
     };
   };
 
diff --git a/modules/services/pass-secret-service.nix b/modules/services/pass-secret-service.nix
index 91e5cd017..907477bf1 100644
--- a/modules/services/pass-secret-service.nix
+++ b/modules/services/pass-secret-service.nix
@@ -12,7 +12,7 @@ in {
   options.services.pass-secret-service = {
     enable = mkEnableOption "Pass libsecret service";
 
-    package = mkPackageOption pkgs "pass-secret-service" { };
+    package = mkPackageOptionMD pkgs "pass-secret-service" { };
 
     storePath = mkOption {
       type = with types; nullOr str;
diff --git a/modules/services/pueue.nix b/modules/services/pueue.nix
index 3375f49d7..3733ef391 100644
--- a/modules/services/pueue.nix
+++ b/modules/services/pueue.nix
@@ -14,7 +14,7 @@ in {
   options.services.pueue = {
     enable = mkEnableOption "Pueue, CLI process scheduler and manager";
 
-    package = mkPackageOption pkgs "pueue" { };
+    package = mkPackageOptionMD pkgs "pueue" { };
 
     settings = mkOption {
       type = yamlFormat.type;
diff --git a/modules/services/safeeyes.nix b/modules/services/safeeyes.nix
index 156624691..4ce7afada 100644
--- a/modules/services/safeeyes.nix
+++ b/modules/services/safeeyes.nix
@@ -13,7 +13,7 @@ in {
     services.safeeyes = {
       enable = mkEnableOption "The Safe Eyes OSGI service";
 
-      package = mkPackageOption pkgs "safeeyes" { };
+      package = mkPackageOptionMD pkgs "safeeyes" { };
     };
   };
 
diff --git a/modules/services/window-managers/fluxbox.nix b/modules/services/window-managers/fluxbox.nix
index 6b05d2958..3781a0205 100644
--- a/modules/services/window-managers/fluxbox.nix
+++ b/modules/services/window-managers/fluxbox.nix
@@ -13,7 +13,7 @@ in {
     xsession.windowManager.fluxbox = {
       enable = mkEnableOption "Fluxbox window manager";
 
-      package = mkPackageOption pkgs "fluxbox" { };
+      package = mkPackageOptionMD pkgs "fluxbox" { };
 
       init = mkOption {
         type = types.lines;
diff --git a/modules/services/window-managers/i3-sway/i3.nix b/modules/services/window-managers/i3-sway/i3.nix
index b4742c787..23627aedd 100644
--- a/modules/services/window-managers/i3-sway/i3.nix
+++ b/modules/services/window-managers/i3-sway/i3.nix
@@ -208,7 +208,7 @@ in {
     xsession.windowManager.i3 = {
       enable = mkEnableOption "i3 window manager";
 
-      package = mkPackageOption pkgs "i3" { };
+      package = mkPackageOptionMD pkgs "i3" { };
 
       config = mkOption {
         type = types.nullOr configModule;