treewide: revert shared cmp source option

Author: horriblename

modules/plugins/assistant/copilot/config.nix

@@ -58,8 +58,8 @@ in {
         };
       };
 
-      autocomplete = {
-        nvim-cmp.sources = {copilot = "[Copilot]";};
+      autocomplete.nvim-cmp = {
+        sources = {copilot = "[Copilot]";};
         sourcePlugins = ["copilot-cmp"];
       };
 

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

@@ -10,7 +10,7 @@
   inherit (builtins) concatStringsSep typeOf tryEval attrNames mapAttrs;
 
   cfg = config.vim.autocomplete.blink-cmp;
-  autocompleteCfg = config.vim.autocomplete;
+  cmpCfg = config.vim.autocomplete.nvim-cmp;
   inherit (cfg) mappings;
 
   getPluginName = plugin:
@@ -36,23 +36,21 @@ in {
           ${optionalString config.vim.lazy.enable
             (concatStringsSep "\n" (map
               (package: "require('lz.n').trigger_load(${toLuaObject (getPluginName package)})")
-              autocompleteCfg.sourcePlugins))}
+              cmpCfg.sourcePlugins))}
         '';
       };
     };
 
     autocomplete = {
-      enableSharedCmpSources = true;
-
       blink-cmp.setupOpts = {
         sources = {
-          default = ["lsp" "path" "snippets" "buffer"] ++ (attrNames autocompleteCfg.nvim-cmp.sources);
+          default = ["lsp" "path" "snippets" "buffer"] ++ (attrNames cmpCfg.sources);
           providers =
             mapAttrs (name: _: {
               inherit name;
               module = "blink.compat.source";
             })
-            autocompleteCfg.nvim-cmp.sources;
+            cmpCfg.sources;
         };
         snippets = mkIf config.vim.snippets.luasnip.enable {
           preset = "luasnip";

modules/plugins/completion/config.nix

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

modules/plugins/completion/default.nix

@@ -12,7 +12,6 @@
   borders = config.vim.ui.borders.plugins.nvim-cmp;
 
   cfg = config.vim.autocomplete.nvim-cmp;
-  autocompleteCfg = config.vim.autocomplete;
   luasnipEnable = config.vim.snippets.luasnip.enable;
   getPluginName = plugin:
     if typeOf plugin == "string"
@@ -49,18 +48,16 @@ in {
             ${optionalString config.vim.lazy.enable
               (concatStringsSep "\n" (map
                 (package: "require('lz.n').trigger_load(${toLuaObject (getPluginName package)})")
-                autocompleteCfg.sourcePlugins))}
+                cfg.sourcePlugins))}
           '';
 
           event = ["InsertEnter" "CmdlineEnter"];
         };
       };
 
       autocomplete = {
-        enableSharedCmpSources = true;
-        sourcePlugins = ["cmp-buffer" "cmp-path"];
-
         nvim-cmp = {
+          sourcePlugins = ["cmp-buffer" "cmp-path"];
           sources = {
             nvim-cmp = null;
             buffer = "[Buffer]";

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

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

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

@@ -23,8 +23,8 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      autocomplete = mkIf usingNvimCmp {
-        nvim-cmp.sources = {nvim_lsp = "[LSP]";};
+      autocomplete.nvim-cmp = mkIf usingNvimCmp {
+        sources = {nvim_lsp = "[LSP]";};
         sourcePlugins = ["cmp-nvim-lsp"];
       };
 

modules/plugins/completion/options.nix

@@ -7,6 +7,8 @@
   inherit (lib.types) bool str nullOr;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.types) mkPluginSetupOption;
+
+  completionCfg = config.vim.autocomplete;
 in {
   imports = let
     renamedSetupOption = oldPath: newPath:
@@ -42,7 +44,7 @@ in {
             # If using nvim-cmp, otherwise set to false
             type = bool;
             description = "If using nvim-cmp, otherwise set to false";
-            default = config.vim.autocomplete.enableSharedCmpSources;
+            default = completionCfg.nvim-cmp.enable || completionCfg.blink-cmp.enable;
           };
         };
       };

modules/plugins/lsp/config.nix

@@ -17,8 +17,8 @@ in {
         };
       };
       startPlugins = cfg.providers;
-      autocomplete = mkIf config.vim.autocomplete.nvim-cmp.enable {
-        nvim-cmp.sources = {luasnip = "[LuaSnip]";};
+      autocomplete.nvim-cmp = mkIf config.vim.autocomplete.nvim-cmp.enable {
+        sources = {luasnip = "[LuaSnip]";};
         sourcePlugins = ["cmp-luasnip"];
       };
     };