From 96ebd63330476774efbe9a87a7b1c93b21d764da Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 22:50:16 +0200
Subject: [PATCH] modules/dependencies: add fzf

---
 modules/dependencies.nix            |  4 ++++
 plugins/by-name/fzf-lua/default.nix | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 23af2f1b..8ee7acfd 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -14,6 +14,10 @@ let
     direnv.default = "direnv";
     distant.default = "distant";
     fish.default = "fish";
+    fzf = {
+      default = "fzf";
+      example = "pkgs.skim";
+    };
     gcc.default = "gcc";
     gh.default = "gh";
     git = {
diff --git a/plugins/by-name/fzf-lua/default.nix b/plugins/by-name/fzf-lua/default.nix
index 56cd6c9e..52744219 100644
--- a/plugins/by-name/fzf-lua/default.nix
+++ b/plugins/by-name/fzf-lua/default.nix
@@ -2,8 +2,6 @@
   config,
   lib,
   helpers,
-  options,
-  pkgs,
   ...
 }:
 with lib;
@@ -38,12 +36,15 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
   inherit settingsOptions settingsExample;
 
-  extraOptions = {
-    fzfPackage = lib.mkPackageOption pkgs "fzf" {
-      nullable = true;
-      example = "pkgs.skim";
-    };
+  imports = [
+    # TODO: added 2025-04-07, remove after 25.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "fzf-lua";
+      packageName = "fzf";
+    })
+  ];
 
+  extraOptions = {
     # TODO: deprecated 2024-08-29 remove after 24.11
     iconsEnabled = mkOption {
       type = types.bool;
@@ -129,7 +130,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
           enable = lib.mkOverride 1490 true;
         };
 
-    extraPackages = [ cfg.fzfPackage ];
+    dependencies.fzf.enable = lib.mkDefault true;
 
     plugins.fzf-lua.settings.__unkeyed_profile = cfg.profile;