From 84676128f8e6b3175d4736f2422944c10a73389f Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 4 Sep 2024 21:55:25 +0100
Subject: [PATCH] plugins/dap/extensions: use `lib.mkPackageOption`

---
 plugins/dap/dap-go.nix           | 7 ++++++-
 plugins/dap/dap-python.nix       | 7 ++++++-
 plugins/dap/dap-ui.nix           | 7 ++++++-
 plugins/dap/dap-virtual-text.nix | 7 ++++++-
 plugins/dap/default.nix          | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/plugins/dap/dap-go.nix b/plugins/dap/dap-go.nix
index 69d0ad01..760bd2c4 100644
--- a/plugins/dap/dap-go.nix
+++ b/plugins/dap/dap-go.nix
@@ -14,7 +14,12 @@ in
   options.plugins.dap.extensions.dap-go = {
     enable = mkEnableOption "dap-go";
 
-    package = helpers.mkPluginPackageOption "dap-go" pkgs.vimPlugins.nvim-dap-go;
+    package = lib.mkPackageOption pkgs "dap-go" {
+      default = [
+        "vimPlugins"
+        "nvim-dap-go"
+      ];
+    };
 
     dapConfigurations = helpers.mkNullOrOption (types.listOf dapHelpers.configurationOption) ''
       Additional dap configurations.
diff --git a/plugins/dap/dap-python.nix b/plugins/dap/dap-python.nix
index c191ee54..957573de 100644
--- a/plugins/dap/dap-python.nix
+++ b/plugins/dap/dap-python.nix
@@ -14,7 +14,12 @@ in
   options.plugins.dap.extensions.dap-python = {
     enable = mkEnableOption "dap-python";
 
-    package = helpers.mkPluginPackageOption "dap-python" pkgs.vimPlugins.nvim-dap-python;
+    package = lib.mkPackageOption pkgs "dap-python" {
+      default = [
+        "vimPlugins"
+        "nvim-dap-python"
+      ];
+    };
 
     adapterPythonPath = mkOption {
       default = "${pkgs.python3.withPackages (ps: with ps; [ debugpy ])}/bin/python3";
diff --git a/plugins/dap/dap-ui.nix b/plugins/dap/dap-ui.nix
index d37acbc0..2319517f 100644
--- a/plugins/dap/dap-ui.nix
+++ b/plugins/dap/dap-ui.nix
@@ -59,7 +59,12 @@ in
   options.plugins.dap.extensions.dap-ui = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "dap-ui";
 
-    package = helpers.mkPluginPackageOption "dap-ui" pkgs.vimPlugins.nvim-dap-ui;
+    package = lib.mkPackageOption pkgs "dap-ui" {
+      default = [
+        "vimPlugins"
+        "nvim-dap-ui"
+      ];
+    };
 
     controls = {
       enabled = helpers.defaultNullOpts.mkBool true "Enable controls";
diff --git a/plugins/dap/dap-virtual-text.nix b/plugins/dap/dap-virtual-text.nix
index 7f206efd..5ba81c7c 100644
--- a/plugins/dap/dap-virtual-text.nix
+++ b/plugins/dap/dap-virtual-text.nix
@@ -13,7 +13,12 @@ in
   options.plugins.dap.extensions.dap-virtual-text = {
     enable = mkEnableOption "dap-virtual-text";
 
-    package = helpers.mkPluginPackageOption "dap-virtual-text" pkgs.vimPlugins.nvim-dap-virtual-text;
+    package = lib.mkPackageOption pkgs "dap-virtual-text" {
+      default = [
+        "vimPlugins"
+        "nvim-dap-virtual-text"
+      ];
+    };
 
     enabledCommands = helpers.defaultNullOpts.mkBool true ''
       Create commands `DapVirtualTextEnable`, `DapVirtualTextDisable`, `DapVirtualTextToggle`.
diff --git a/plugins/dap/default.nix b/plugins/dap/default.nix
index 39045737..c7d09cbd 100644
--- a/plugins/dap/default.nix
+++ b/plugins/dap/default.nix
@@ -22,7 +22,12 @@ with dapHelpers;
   options.plugins.dap = helpers.neovim-plugin.extraOptionsOptions // {
     enable = mkEnableOption "dap";
 
-    package = helpers.mkPluginPackageOption "dap" pkgs.vimPlugins.nvim-dap;
+    package = lib.mkPackageOption pkgs "dap" {
+      default = [
+        "vimPlugins"
+        "nvim-dap"
+      ];
+    };
 
     adapters = helpers.mkCompositeOption "Dap adapters." {
       executables = mkAdapterOption "executable" executableAdapterOption;