cmp: move source plugin into parent option

modules/plugins/completion/config.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (builtins) typeOf tryEval;
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  cfg = config.vim.autocomplete;
+
+  getPluginName = plugin:
+    if typeOf plugin == "string"
+    then plugin
+    else if (plugin ? pname && (tryEval plugin.pname).success)
+    then plugin.pname
+    else plugin.name;
+in {
+  vim = mkIf cfg.enableSharedCmpSources {
+    startPlugins = ["rtp-nvim"];
+    lazy.plugins =
+      mapListToAttrs (package: {
+        name = getPluginName package;
+        value = {
+          inherit package;
+          lazy = true;
+          after = ''
+            local path = vim.fn.globpath(vim.o.packpath, 'pack/*/opt/${getPluginName package}')
+            require("rtp_nvim").source_after_plugin_dir(path)
+          '';
+        };
+      })
+      cfg.sourcePlugins;
+  };
+}

modules/plugins/completion/default.nix

@@ -1,5 +1,8 @@
 {
   imports = [
+    ./config.nix
+    ./options.nix
+
     ./nvim-cmp
     ./blink-cmp
   ];

modules/plugins/completion/nvim-cmp/config.nix

@@ -3,11 +3,10 @@
   config,
   ...
 }: let
-  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.modules) mkIf;
   inherit (lib.strings) optionalString;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (builtins) attrNames typeOf tryEval concatStringsSep;
 
   borders = config.vim.ui.borders.plugins.nvim-cmp;
@@ -24,21 +23,9 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["rtp-nvim"];
+      autocomplete.enableSharedCmpSources = true;
-      lazy.plugins = mkMerge [
+
-        (mapListToAttrs (package: {
+      lazy.plugins = {
-            name = getPluginName package;
-            value = {
-              inherit package;
-              lazy = true;
-              after = ''
-                local path = vim.fn.globpath(vim.o.packpath, 'pack/*/opt/${getPluginName package}')
-                require("rtp_nvim").source_after_plugin_dir(path)
-              '';
-            };
-          })
-          cfg.sourcePlugins)
-        {
         nvim-cmp = {
           package = "nvim-cmp";
           after = ''
@@ -68,8 +55,7 @@ in {
 
           event = ["InsertEnter" "CmdlineEnter"];
         };
-        }
+      };
-      ];
 
       autocomplete.nvim-cmp = {
         sources = {

modules/plugins/completion/nvim-cmp/nvim-cmp.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
-  inherit (lib.types) str attrsOf nullOr either listOf;
+  inherit (lib.types) str attrsOf nullOr either;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.binds) mkMappingOption;
-  inherit (lib.nvim.types) mkPluginSetupOption luaInline mergelessListOf pluginType;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline mergelessListOf;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (builtins) isString;
 
@@ -107,11 +107,5 @@ in {
         }
       '';
     };
-
-    sourcePlugins = mkOption {
-      type = listOf pluginType;
-      default = [];
-      description = "List of source plugins used by nvim-cmp.";
-    };
   };
 }

modules/plugins/completion/options.nix

@@ -1,7 +1,15 @@
 {lib, ...}: let
-  inherit (lib.options) mkEnableOption;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) listOf;
+  inherit (lib.nvim.types) pluginType;
 in {
   options.vim.autocomplete = {
-    enableSharedCmpSources = mkEnableOption "cmp sources that can work in nvim-cmp and blink.cmp";
+    enableSharedCmpSources = mkEnableOption "cmp sources shared by nvim-cmp and blink.cmp";
+
+    cmpSourcePlugins = mkOption {
+      type = listOf pluginType;
+      default = [];
+      description = "List of cmp source plugins.";
+    };
   };
 }