From ada40e0f7472ec9a46a8c6327a2bec95f3c0a4c0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 18:21:01 +0200
Subject: [PATCH] modules/dependencies: add fish

---
 modules/dependencies.nix        |  1 +
 plugins/cmp/sources/default.nix | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 7aacbbd2..281a2208 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -12,6 +12,7 @@ let
     curl.default = "curl";
     direnv.default = "direnv";
     distant.default = "distant";
+    fish.default = "fish";
     gcc.default = "gcc";
     gh.default = "gh";
     git = {
diff --git a/plugins/cmp/sources/default.nix b/plugins/cmp/sources/default.nix
index b68b762f..6e8e803d 100644
--- a/plugins/cmp/sources/default.nix
+++ b/plugins/cmp/sources/default.nix
@@ -58,8 +58,16 @@ let
       pluginName = "cmp-fish";
       sourceName = "fish";
 
-      extraOptions.fishPackage = lib.mkPackageOption pkgs "fish" { nullable = true; };
-      extraConfig = cfg: { extraPackages = [ cfg.fishPackage ]; };
+      imports = [
+        # TODO: added 2025-04-07, remove after 25.05
+        (lib.nixvim.mkRemovedPackageOptionModule {
+          plugin = "cmp-fish";
+          packageName = "fish";
+        })
+      ];
+      extraConfig = {
+        dependencies.fish.enable = lib.mkDefault true;
+      };
     }
     {
       pluginName = "cmp-fuzzy-buffer";