autocomplete: move shared code into common parent

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

@@ -42,6 +42,7 @@ in {
     };
 
     autocomplete = {
+      enableSharedCmpSources = true;
       blink-cmp.setupOpts = {
         sources = {
           default = ["lsp" "path" "snippets" "buffer"] ++ (attrNames cmpCfg.sources);

modules/plugins/completion/config.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (builtins) typeOf tryEval;
+
+  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 {
+  config.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.nvim-cmp.sourcePlugins;
+  };
+}

modules/plugins/completion/default.nix

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

modules/plugins/completion/module.nix

@@ -0,0 +1,7 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+in {
+  options.vim.autocomplete = {
+    enableSharedCmpSources = mkEnableOption "sources shared by blink.cmp and nvim-cmp";
+  };
+}

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

@@ -24,21 +24,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["rtp-nvim"];
+      lazy.plugins = {
-      lazy.plugins = mkMerge [
-        (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)
-        {
         nvim-cmp = {
           package = "nvim-cmp";
           after = ''
@@ -68,10 +54,12 @@ in {
 
           event = ["InsertEnter" "CmdlineEnter"];
         };
-        }
+      };
-      ];
 
-      autocomplete.nvim-cmp = {
+      autocomplete = {
+        enableSharedCmpSources = true;
+
+        nvim-cmp = {
           sources = {
             nvim-cmp = null;
             buffer = "[Buffer]";
@@ -137,4 +125,5 @@ in {
         };
       };
     };
+  };
 }