blink: switch from nvim-cmp git to blink-cmp-git

khaneliman · Feb 4, 2025 · 6f77eb2 · 6f77eb2
1 parent b5e423f
commit 6f77eb2
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/modules/nixvim/plugins/blink/default.nix b/modules/nixvim/plugins/blink/default.nix
@@ -7,10 +7,12 @@
   ...
 }:
 {
+  extraPackages = [ pkgs.gh ];
   extraPlugins = lib.mkIf config.plugins.blink-cmp.enable (
     with pkgs.vimPlugins;
     [
       blink-cmp-spell
+      blink-cmp-git
       blink-copilot
       blink-emoji-nvim
       blink-ripgrep-nvim
@@ -119,13 +121,13 @@
                 # Community
                 "copilot"
                 "emoji"
+                "git"
                 "spell"
                 # FIXME: locking up nvim
                 # "ripgrep"
                 # Cmp sources
                 # TODO: migrate when available
                 "calc"
-                "git"
                 "zsh"
               ]
               ++ lib.optionals config.plugins.avante.enable [
@@ -149,6 +151,17 @@
                   module = "blink-emoji";
                   score_offset = 1;
                 };
+                git = {
+                  name = "Git";
+                  module = "blink-cmp-git";
+                  enabled = true;
+                  score_offset = 100;
+                  should_show_items.__raw = ''
+                    function()
+                      return vim.o.filetype == 'gitcommit' or vim.o.filetype == 'markdown'
+                    end
+                  '';
+                };
                 ripgrep = {
                   name = "Ripgrep";
                   module = "blink-ripgrep";
@@ -168,11 +181,6 @@
                   module = "blink.compat.source";
                   score_offset = 2;
                 };
-                git = {
-                  name = "git";
-                  module = "blink.compat.source";
-                  score_offset = 0;
-                };
                 npm = {
                   name = "npm";
                   module = "blink.compat.source";
@@ -223,7 +231,6 @@
     }
     (lib.mkIf config.plugins.blink-cmp.enable {
       cmp-calc.enable = true;
-      cmp-git.enable = true;
       cmp-zsh.enable = true;
 
       lsp.capabilities = # Lua