diff --git a/plugins/cmp/sources/cmp-fish.nix b/plugins/cmp/sources/cmp-fish.nix
deleted file mode 100644
index 772cfbf7..00000000
--- a/plugins/cmp/sources/cmp-fish.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.plugins.cmp-fish;
-in
-{
-  meta.maintainers = [ lib.maintainers.GaetanLepage ];
-
-  options.plugins.cmp-fish = {
-    fishPackage = lib.mkPackageOption pkgs "fish" {
-      nullable = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable { extraPackages = [ cfg.fishPackage ]; };
-}
diff --git a/plugins/cmp/sources/default.nix b/plugins/cmp/sources/default.nix
index 5f6654a5..37221104 100644
--- a/plugins/cmp/sources/default.nix
+++ b/plugins/cmp/sources/default.nix
@@ -61,6 +61,9 @@ let
     {
       pluginName = "cmp-fish";
       sourceName = "fish";
+
+      extraOptions.fishPackage = lib.mkPackageOption pkgs "fish" { nullable = true; };
+      extraConfig = cfg: { extraPackages = [ cfg.fishPackage ]; };
     }
     {
       pluginName = "cmp-fuzzy-buffer";
@@ -200,7 +203,6 @@ in
   imports = [
     ./copilot-cmp.nix
     ./cmp-ai.nix
-    ./cmp-fish.nix
     ./cmp-git.nix
     ./cmp-tabnine.nix
     ./crates-nvim.nix