From dfb754cdc4544ddb66f0e258f4f86d798bf6fab4 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 2 Sep 2024 14:25:18 +0100
Subject: [PATCH] plugins/telescope/extensions: use `lib.mkPackageOption`

---
 plugins/telescope/extensions/_helpers.nix     | 19 +++++++++++++++----
 plugins/telescope/extensions/file-browser.nix |  2 +-
 plugins/telescope/extensions/frecency.nix     |  2 +-
 plugins/telescope/extensions/fzf-native.nix   |  2 +-
 plugins/telescope/extensions/fzy-native.nix   |  2 +-
 plugins/telescope/extensions/media-files.nix  |  2 +-
 plugins/telescope/extensions/ui-select.nix    |  2 +-
 plugins/telescope/extensions/undo.nix         |  2 +-
 8 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/plugins/telescope/extensions/_helpers.nix b/plugins/telescope/extensions/_helpers.nix
index 943566fb..cb6a077b 100644
--- a/plugins/telescope/extensions/_helpers.nix
+++ b/plugins/telescope/extensions/_helpers.nix
@@ -1,12 +1,18 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
-  inherit (lib.nixvim) mkPluginPackageOption mkSettingsOption toSnakeCase;
+  inherit (lib.nixvim) mkSettingsOption toSnakeCase;
+  inherit (lib) mkPackageOption;
 in
 rec {
   mkExtension =
     {
       name,
-      defaultPackage,
+      package,
       extensionName ? name,
       settingsOptions ? { },
       settingsExample ? null,
@@ -41,7 +47,12 @@ rec {
       options.plugins.telescope.extensions.${name} = {
         enable = lib.mkEnableOption "the `${name}` telescope extension";
 
-        package = mkPluginPackageOption name defaultPackage;
+        package = mkPackageOption pkgs name {
+          default = [
+            "vimPlugins"
+            package
+          ];
+        };
 
         settings = mkSettingsOption {
           description = "settings for the `${name}` telescope extension.";
diff --git a/plugins/telescope/extensions/file-browser.nix b/plugins/telescope/extensions/file-browser.nix
index 98c87799..e6973e86 100644
--- a/plugins/telescope/extensions/file-browser.nix
+++ b/plugins/telescope/extensions/file-browser.nix
@@ -12,7 +12,7 @@ in
 telescopeHelpers.mkExtension {
   name = "file-browser";
   extensionName = "file_browser";
-  defaultPackage = pkgs.vimPlugins.telescope-file-browser-nvim;
+  package = "telescope-file-browser-nvim";
 
   # TODO: introduced 2024-03-24, remove on 2024-05-24
   optionsRenamedToSettings = [
diff --git a/plugins/telescope/extensions/frecency.nix b/plugins/telescope/extensions/frecency.nix
index dfda45d0..41b8471f 100644
--- a/plugins/telescope/extensions/frecency.nix
+++ b/plugins/telescope/extensions/frecency.nix
@@ -10,7 +10,7 @@ let
 in
 (import ./_helpers.nix { inherit lib config pkgs; }).mkExtension {
   name = "frecency";
-  defaultPackage = pkgs.vimPlugins.telescope-frecency-nvim;
+  package = "telescope-frecency-nvim";
 
   # TODO: introduced 2024-03-24, remove on 2024-05-24
   optionsRenamedToSettings = [
diff --git a/plugins/telescope/extensions/fzf-native.nix b/plugins/telescope/extensions/fzf-native.nix
index d91130a6..458650b9 100644
--- a/plugins/telescope/extensions/fzf-native.nix
+++ b/plugins/telescope/extensions/fzf-native.nix
@@ -10,7 +10,7 @@ in
 (import ./_helpers.nix { inherit lib config pkgs; }).mkExtension {
   name = "fzf-native";
   extensionName = "fzf";
-  defaultPackage = pkgs.vimPlugins.telescope-fzf-native-nvim;
+  package = "telescope-fzf-native-nvim";
 
   # TODO: introduced 2024-03-24, remove on 2024-05-24
   optionsRenamedToSettings = [
diff --git a/plugins/telescope/extensions/fzy-native.nix b/plugins/telescope/extensions/fzy-native.nix
index 063a7af9..a5fe01cd 100644
--- a/plugins/telescope/extensions/fzy-native.nix
+++ b/plugins/telescope/extensions/fzy-native.nix
@@ -10,7 +10,7 @@ in
 (import ./_helpers.nix { inherit lib config pkgs; }).mkExtension {
   name = "fzy-native";
   extensionName = "fzy_native";
-  defaultPackage = pkgs.vimPlugins.telescope-fzy-native-nvim;
+  package = "telescope-fzy-native-nvim";
 
   # TODO: introduced 2024-03-24, remove on 2024-05-24
   optionsRenamedToSettings = [
diff --git a/plugins/telescope/extensions/media-files.nix b/plugins/telescope/extensions/media-files.nix
index e51b689d..6d174980 100644
--- a/plugins/telescope/extensions/media-files.nix
+++ b/plugins/telescope/extensions/media-files.nix
@@ -11,7 +11,7 @@ in
 (import ./_helpers.nix { inherit lib config pkgs; }).mkExtension {
   name = "media-files";
   extensionName = "media_files";
-  defaultPackage = pkgs.vimPlugins.telescope-media-files-nvim;
+  package = "telescope-media-files-nvim";
 
   # TODO: introduced 2024-03-24, remove on 2024-05-24
   imports =
diff --git a/plugins/telescope/extensions/ui-select.nix b/plugins/telescope/extensions/ui-select.nix
index cc0b7546..e1930e42 100644
--- a/plugins/telescope/extensions/ui-select.nix
+++ b/plugins/telescope/extensions/ui-select.nix
@@ -6,7 +6,7 @@
 }:
 (import ./_helpers.nix { inherit lib config pkgs; }).mkExtension {
   name = "ui-select";
-  defaultPackage = pkgs.vimPlugins.telescope-ui-select-nvim;
+  package = "telescope-ui-select-nvim";
 
   settingsExample = {
     specific_opts.codeactions = false;
diff --git a/plugins/telescope/extensions/undo.nix b/plugins/telescope/extensions/undo.nix
index 153660f1..2f059f9e 100644
--- a/plugins/telescope/extensions/undo.nix
+++ b/plugins/telescope/extensions/undo.nix
@@ -11,7 +11,7 @@ let
 in
 telescopeHelpers.mkExtension {
   name = "undo";
-  defaultPackage = pkgs.vimPlugins.telescope-undo-nvim;
+  package = "telescope-undo-nvim";
 
   # TODO: introduced 2024-03-24, remove on 2024-05-24
   optionsRenamedToSettings = [