From 17c7b15981cf8a5d522f160c2c1e82c2570f1220 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Sun, 24 Nov 2024 23:33:14 +0100
Subject: [PATCH] neovim: Make cmp sources work

---
 neovim/completion.nix | 45 +++++++++++++++++++++----------------------
 neovim/pkg.nix        |  2 ++
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/neovim/completion.nix b/neovim/completion.nix
index 0c60a13..4ca4a77 100644
--- a/neovim/completion.nix
+++ b/neovim/completion.nix
@@ -29,27 +29,28 @@
           "fallback"
         ];
       };
-      completion.enabled_providers = [
-        "lsp"
-        "buffer"
-        "path"
-        "git"
-        "calc"
-        "omni"
-      ];
-      # Does not seem to work
-      providers = {
-        git = {
-          name = "git";
-          module = "blink.compat.source";
-        };
-        calc = {
-          name = "calc";
-          module = "blink.compat.source";
-        };
-        omni = {
-          name = "omni";
-          module = "blink.compat.source";
+      sources = {
+        completion.enabled_providers = [
+          "lsp"
+          "buffer"
+          "path"
+          "git"
+          "calc"
+          "omni"
+        ];
+        providers = {
+          git = {
+            name = "git";
+            module = "blink.compat.source";
+          };
+          calc = {
+            name = "calc";
+            module = "blink.compat.source";
+          };
+          omni = {
+            name = "omni";
+            module = "blink.compat.source";
+          };
         };
       };
     };
@@ -63,6 +64,4 @@
   plugins.cmp-omni.enable = true;
   plugins.cmp-git.enable = true;
   plugins.cmp-calc.enable = true;
-
-  performance.combinePlugins.standalonePlugins = [ "nvim-cmp" ];
 }
diff --git a/neovim/pkg.nix b/neovim/pkg.nix
index 6964021..05fe31f 100644
--- a/neovim/pkg.nix
+++ b/neovim/pkg.nix
@@ -42,6 +42,8 @@
                     src = inputs."blink.compat";
                     version = inputs."blink.compat".shortRev;
                   };
+
+                  nvim-cmp = final'.blink-compat;
                 }
               );
             }