Update 2025-01-30

lua/plugins/avante.lua

@@ -1,46 +0,0 @@
-return {
-	"yetone/avante.nvim",
-	event = "VeryLazy",
-	lazy = false,
-	version = false, -- Set this to "*" to always pull the latest release version, or set it to false to update to the latest code changes.
-	enabled = false,
-	opts = {
-		-- add any opts here
-	},
-	-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
-	build = "make",
-	-- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows
-	dependencies = {
-		"stevearc/dressing.nvim",
-		"nvim-lua/plenary.nvim",
-		"MunifTanjim/nui.nvim",
-		"nvim-telescope/telescope.nvim",
-		-- "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
-		"echasnovski/mini.icons",
-		{
-			-- support for image pasting
-			"HakonHarnes/img-clip.nvim",
-			event = "VeryLazy",
-			opts = {
-				-- recommended settings
-				default = {
-					embed_image_as_base64 = false,
-					prompt_for_file_name = false,
-					drag_and_drop = {
-						insert_mode = true,
-					},
-					-- required for Windows users
-					use_absolute_path = true,
-				},
-			},
-		},
-		{
-			-- Make sure to set this up properly if you have lazy=true
-			"MeanderingProgrammer/render-markdown.nvim",
-			opts = {
-				file_types = { "markdown", "Avante" },
-			},
-			ft = { "markdown", "Avante" },
-		},
-	},
-}

lua/plugins/blink.lua

@@ -7,7 +7,10 @@ return {
 			{ "L3MON4D3/LuaSnip", version = "v2.*" },
 			"Saecki/crates.nvim",
 			"davidsierradz/cmp-conventionalcommits",
-			"petertriho/cmp-git", -- TODO: make this work
+			{
+				"Kaiser-Yang/blink-cmp-git",
+				dependencies = { "nvim-lua/plenary.nvim" },
+			},
 			"mikavilpas/blink-ripgrep.nvim",
 			"moyiz/blink-emoji.nvim",
 			{
@@ -22,7 +25,6 @@ return {
 				"petertriho/cmp-git",
 				ft = { "gitcommit", "octo", "NeogitCommitMessage" },
 			},
-			-- "milanglacier/minuet-ai.nvim",
 		},
 		version = "*",
 		opts = {
@@ -44,15 +46,14 @@ return {
 						cmp.scroll_documentation_down(4)
 					end,
 				},
-				["<C-g>"] = {
-					function()
-						require("blink-cmp").show({ sources = { "ripgrep" } })
-					end,
-					"fallback",
-				},
+				-- ["<C-g>"] = {
+				-- 	function()
+				-- 		require("blink-cmp").show({ sources = { "ripgrep" } })
+				-- 	end,
+				-- 	"fallback",
+				-- },
 				["<Tab>"] = {},
 				["<S-Tab>"] = {},
-				-- ["<A-y>"] = require("minuet").make_blink_map(),
 			},
 
 			appearance = {
@@ -64,6 +65,7 @@ return {
 			-- elsewhere in your config, without redefining it, due to `opts_extend`
 			sources = {
 				default = {
+					"git",
 					"lazydev",
 					"crates",
 					"lsp",
@@ -72,7 +74,7 @@ return {
 					"git",
 					"dbee",
 					"snippets",
-					-- "minuet",
+					"ripgrep",
 				},
 				providers = {
 					lazydev = {
@@ -85,11 +87,6 @@ return {
 						module = "blink.compat.source",
 						score_offset = 10,
 					},
-					git = {
-						name = "git",
-						module = "blink.compat.source",
-						score_offset = 20,
-					},
 					dbee = {
 						name = "cmp-dbee",
 						module = "blink.compat.source",
@@ -119,11 +116,15 @@ return {
 						module = "blink.compat.source",
 						score_offset = 100,
 					},
-					-- minuet = {
-					-- 	name = "minuet",
-					-- 	module = "minuet.blink",
-					-- 	score_offset = 8, -- Gives minuet higher priority among suggestions
-					-- },
+					git = {
+						score_offset = 100,
+						module = "blink-cmp-git",
+						name = "Git",
+						should_show_items = function()
+							return vim.o.filetype == "gitcommit" or vim.o.filetype == "markdown"
+						end,
+						opts = {},
+					},
 				},
 			},
 			completion = {

lua/plugins/cmp-git.lua

@@ -1,15 +0,0 @@
-return {
-	"petertriho/cmp-git",
-	dependencies = { "nvim-lua/plenary.nvim" },
-	ft = { "gitcommit", "octo", "NeogitCommitMessage" },
-	opts = {
-		gitlab = {
-			hosts = {
-				"git.modulation.lv",
-			},
-		},
-	},
-	config = function(_, opts)
-		require("cmp_git").setup(opts)
-	end,
-}

lua/plugins/lspconfig.lua

@@ -328,7 +328,6 @@ return {
 					outputPath = "$root/target/$dir/$name",
 				},
 			},
-			-- ts_ls = function() end,
 		},
 	},
 }

lua/plugins/minuet.lua

@@ -1,26 +0,0 @@
-return {
-	"milanglacier/minuet-ai.nvim",
-	enabled = false,
-	opts = {
-		end_point = "http://127.0.0.1:1234/v1/chat/completions",
-		virtualtext = {
-			auto_trigger_ft = {},
-			keymap = {
-				-- accept whole completion
-				accept = "<A-A>",
-				-- accept one line
-				accept_line = "<A-a>",
-				-- accept n lines (prompts for number)
-				accept_n_lines = "<A-z>",
-				-- Cycle to prev completion item, or manually invoke completion
-				prev = "<A-[>",
-				-- Cycle to next completion item, or manually invoke completion
-				next = "<A-]>",
-				dismiss = "<A-e>",
-			},
-		},
-	},
-	config = function(_, opts)
-		require("minuet").setup(opts)
-	end,
-}

lua/plugins/typescript-tools.lua

@@ -4,7 +4,6 @@ return {
 		dependencies = {
 			"nvim-lua/plenary.nvim",
 			"neovim/nvim-lspconfig",
-			"saghen/blink.cmp",
 		},
 		ft = { "javascriptreact", "typescriptreact", "javascript", "typescript" },
 		opts = {
@@ -14,7 +13,7 @@ return {
 			end,
 			settings = {
 				-- spawn additional tsserver instance to calculate diagnostics on it
-				separate_diagnostic_server = true,
+				separate_diagnostic_server = false,
 				-- "change"|"insert_leave" determine when the client asks the server about diagnostic
 				publish_diagnostic_on = "insert_leave",
 				-- array of strings("fix_all"|"add_missing_imports"|"remove_unused"|