feat: make treesitter and blink work

Author: chrishrb

modules/common/nvim/default.nix

@@ -56,6 +56,7 @@ let
           nixd
           nixfmt # nix
           lua-language-server
+          tree-sitter
           stylua # lua
           vscode-langservers-extracted # html, css, json
           bash-language-server # bash
@@ -131,16 +132,9 @@ let
             garbage-day-nvim # stop inactive lsp clients
           ];
           cmp = [
-            nvim-cmp
-            cmp-buffer
-            cmp-path
-            cmp-cmdline
-            cmp-nvim-lsp
-            cmp-nvim-lsp-document-symbol
-
-            cmp-git
-            copilot-cmp
-            minuet-ai-nvim
+            blink-cmp
+            blink-cmp-copilot
+            blink-cmp-git
           ];
           core = [
             plenary-nvim

modules/common/nvim/lua/chrishrb/lsp/handlers.lua

@@ -138,11 +138,11 @@ end
 
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 
-local status_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
+local status_ok, blink = pcall(require, "blink.cmp")
 if not status_ok then
 	return
 end
 
-M.capabilities = cmp_nvim_lsp.default_capabilities(capabilities)
+M.capabilities = blink.get_lsp_capabilities(capabilities)
 
 return M

modules/common/nvim/lua/chrishrb/plugins/config/autopairs.lua

@@ -1,4 +1,3 @@
--- Setup nvim-cmp.
 local npairs = require("nvim-autopairs")
 
 npairs.setup({
@@ -22,11 +21,6 @@ npairs.setup({
 	},
 })
 
-local cmp_autopairs = require("nvim-autopairs.completion.cmp")
-local cmp = require("cmp")
-
-cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
-
 -- add rule for codecompanion filetype
 local Rule = require("nvim-autopairs.rule")
 

modules/common/nvim/lua/chrishrb/plugins/config/blink.lua

@@ -0,0 +1,97 @@
+local icons = require("chrishrb.config.icons")
+
+local has_copilot = pcall(require, "blink-cmp-copilot")
+
+local sources_default = { "lsp", "buffer", "path", "git" }
+if has_copilot then
+	table.insert(sources_default, 1, "copilot")
+end
+
+local providers = {
+	lsp = {
+		name = "LSP",
+		module = "blink.cmp.sources.lsp",
+	},
+	buffer = {
+		name = "Buffer",
+		module = "blink.cmp.sources.buffer",
+	},
+	path = {
+		name = "Path",
+		module = "blink.cmp.sources.path",
+	},
+	git = {
+		name = "Git",
+		module = "blink-cmp-git",
+	},
+}
+
+if has_copilot then
+	providers.copilot = {
+		name = "Copilot",
+		module = "blink-cmp-copilot",
+		score_offset = 100,
+		async = true,
+	}
+end
+
+require("blink.cmp").setup({
+	keymap = {
+		["<C-k>"] = { "select_prev", "fallback" },
+		["<C-j>"] = { "select_next", "fallback" },
+		["<C-b>"] = { "scroll_documentation_up", "fallback" },
+		["<C-f>"] = { "scroll_documentation_down", "fallback" },
+		["<C-Space>"] = { "show" },
+		["<C-e>"] = { "cancel", "fallback" },
+		["<CR>"] = { "accept", "fallback" },
+		["<Tab>"] = { "select_next", "fallback" },
+		["<S-Tab>"] = { "select_prev", "fallback" },
+	},
+	cmdline = {
+		keymap = {
+			preset = "inherit",
+
+			["<Tab>"] = { "show_and_insert_or_accept_single", "select_next" },
+			["<S-Tab>"] = { "show_and_insert_or_accept_single", "select_prev" },
+		},
+		completion = { menu = { auto_show = false } },
+	},
+	completion = {
+		menu = {
+			draw = {
+				columns = { { "kind_icon" }, { "label", gap = 1 }, { "source_name" } },
+				components = {
+					kind_icon = {
+						text = function(ctx)
+							return (icons.kind[ctx.kind] or icons.kind.Fallback) .. " "
+						end,
+					},
+					source_name = {
+						text = function(ctx)
+							local labels = {
+								LSP = "[LSP]",
+								Copilot = "[Copilot]",
+								AI = "[AI]",
+								Buffer = "[Buffer]",
+								Path = "[Path]",
+								Git = "[Git]",
+							}
+							return labels[ctx.source_name] or ("[" .. ctx.source_name .. "]")
+						end,
+					},
+				},
+			},
+		},
+		documentation = {
+			auto_show = true,
+			auto_show_delay_ms = 0,
+			window = {
+				border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
+			},
+		},
+	},
+	sources = {
+		default = sources_default,
+		providers = providers,
+	},
+})

modules/common/nvim/lua/chrishrb/plugins/config/cmp.lua

@@ -1,12 +1,40 @@
-local indent_disabled = { "yaml", "python", "java", "terraform" }
+---@param buf integer
+---@param language string
+local function treesitter_try_attach(buf, language)
+	-- check if parser exists and load it
+	if not vim.treesitter.language.add(language) then
+		return false
+	end
+	-- enables syntax highlighting and other treesitter features
+	vim.treesitter.start(buf, language)
 
+	-- enables treesitter based folds
+	vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+	vim.wo.foldmethod = "expr"
+	-- ensure folds are open to begin with
+	vim.o.foldlevel = 99
+
+	-- enables treesitter based indentation
+	vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+
+	return true
+end
+
+local installable_parsers = require("nvim-treesitter").get_available()
 vim.api.nvim_create_autocmd("FileType", {
 	callback = function(args)
-		local ok = pcall(vim.treesitter.start, args.buf)
-		if ok then
-			local ft = vim.bo[args.buf].filetype
-			if not vim.tbl_contains(indent_disabled, ft) then
-				vim.bo[args.buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+		local buf, filetype = args.buf, args.match
+		local language = vim.treesitter.language.get_lang(filetype)
+		if not language then
+			return
+		end
+
+		if not treesitter_try_attach(buf, language) then
+			if vim.tbl_contains(installable_parsers, language) then
+				-- not already installed, so try to install them via nvim-treesitter if possible
+				require("nvim-treesitter").install(language):await(function()
+					treesitter_try_attach(buf, language)
+				end)
 			end
 		end
 	end,

modules/common/nvim/lua/chrishrb/plugins/config/treesitter.lua

@@ -157,24 +157,13 @@ local plugins = {
 	-- Completions
 	-----------------------------------------------------------------------------
 	{
-		"hrsh7th/nvim-cmp",
+		"saghen/blink.cmp",
 		dependencies = {
-			"hrsh7th/cmp-buffer", -- Buffer completions
-			"hrsh7th/cmp-path", -- Path completions
-			"hrsh7th/cmp-cmdline", -- Cmdline completions
-			"hrsh7th/cmp-nvim-lsp", -- LSP completions
-			"hrsh7th/cmp-nvim-lsp-document-symbol", -- For textDocument/documentSymbol
-			"petertriho/cmp-git", -- git source
-			{
-				"zbirenbaum/copilot-cmp",
-				enabled = nixCats("ai"),
-				config = function()
-					require("copilot_cmp").setup()
-				end,
-			},
+			"giuxtaposition/blink-cmp-copilot", -- Copilot completions
+			"Kaiser-Yang/blink-cmp-git", -- git source
 		},
 		config = function()
-			require("chrishrb.plugins.config.cmp")
+			require("chrishrb.plugins.config.blink")
 		end,
 		event = "InsertEnter",
 	},
@@ -184,8 +173,7 @@ local plugins = {
 	-----------------------------------------------------------------------------
 	{
 		"nvim-treesitter/nvim-treesitter",
-		branch = "main",
-		build = nixCatsUtils.lazyAdd(":TSUpdate"),
+		lazy = false,
 		config = function()
 			require("chrishrb.plugins.config.treesitter")
 		end,
@@ -300,7 +288,7 @@ local plugins = {
 		dependencies = {
 			"nvim-lua/plenary.nvim",
 			"nvim-treesitter/nvim-treesitter",
-			"hrsh7th/nvim-cmp", -- Optional: For using slash commands and variables in the chat buffer
+			"saghen/blink.cmp", -- Optional: For using slash commands and variables in the chat buffer
 			{
 				"echasnovski/mini.diff",
 				config = function()