Update 2025-01-29

lua/config/lspconfig-opts.lua

@@ -1,179 +0,0 @@
-return {
-	servers = {
-		gopls = {
-			settings = {
-				hints = {
-					rangeVariableTypes = true,
-					parameterNames = true,
-					constantValues = true,
-					assignVariableTypes = true,
-					compositeLiteralFields = true,
-					compositeLiteralTypes = true,
-					functionTypeParameters = true,
-				},
-			},
-		},
-		lua_ls = {
-			settings = {
-				Lua = {
-					runtime = {
-						-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-						version = "LuaJIT",
-					},
-					diagnostics = {
-						-- Get the language server to recognize the `vim` global
-						globals = { "vim", "awesome", "client" },
-					},
-					-- workspace = {
-					-- Make the server aware of Neovim runtime files
-					-- library = vim.api.nvim_get_runtime_file("", true),
-					-- },
-					-- Do not send telemetry data containing a randomized but unique identifier
-					telemetry = {
-						enable = false,
-					},
-					root_pattern = {
-						".stylua.toml",
-						".luarc.json",
-						".luarc.jsonc",
-						".luacheckrc",
-						"stylua.toml",
-						"selene.toml",
-						"selene.yml",
-						".git",
-					},
-					format = {
-						enable = false,
-					},
-					hint = {
-						enable = true,
-					},
-				},
-			},
-		},
-		clangd = {
-			capabilities = {
-				offsetEncoding = { "utf-16" },
-			},
-			settings = {
-				clangd = {
-					InlayHints = {
-						Designators = true,
-						Enabled = true,
-						ParameterNames = true,
-						DeducedTypes = true,
-					},
-					fallbackFlags = { "-std=c++20" },
-				},
-			},
-		},
-		bashls = {
-			filetypes = {
-				"sh",
-				"bash",
-				"zsh",
-			},
-		},
-		emmet_ls = {
-			filetypes = {
-				"html",
-				"htmldjango",
-				"typescriptreact",
-				"javascriptreact",
-				"css",
-				"sass",
-				"scss",
-				"less",
-				"eruby",
-			},
-		},
-		texlab = {
-			texlab = {
-				auxDirectory = ".",
-				bibtexFormatter = "texlab",
-				build = {
-					args = { "-pdf", "-interaction=nonstopmode", "-synctex=1", "%f" },
-					executable = "xelatex",
-					forwardSearchAfter = false,
-					onSave = false,
-				},
-				chktex = {
-					onEdit = false,
-					onOpenAndSave = false,
-				},
-				diagnosticsDelay = 0,
-				formatterLineLength = 120,
-				forwardSearch = {
-					args = {},
-				},
-				latexFormatter = "latexindent",
-				latexindent = {
-					modifyLineBreaks = false,
-				},
-			},
-		},
-		htmx = {
-			filetypes = { "html", "htmldjango", "templ" },
-		},
-		--[[ pylyzer = {
-			settings = {
-				python = {
-					diagnostics = true,
-					inlayHints = true,
-					smartCompletion = true,
-					checkOnType = true,
-				},
-			},
-		}, ]]
-		--[[ basedpyright = {
-			analysis = {
-				autoSearchPaths = true,
-				diagnosticMode = "openFilesOnly",
-				useLibraryCodeForTypes = true,
-			},
-		}, ]]
-		--[[ pylsp = {
-			settings = {
-				pylsp = {
-					plugins = {
-						autopep8 = { enabled = false },
-						flake8 = { enabled = false },
-						pylint = { enabled = false },
-						yapf = { enabled = false },
-						pydocstyle = { enabled = false },
-						mccabe = { enabled = false },
-						rope_autoimport = { enabled = true },
-						rope_completion = {
-							enabled = true,
-							eager = true,
-						},
-						pycodestyle = {
-							maxLineLength = nil,
-						},
-					},
-				},
-			},
-		}, ]]
-		jinja_lsp = {
-			filetypes = { "html", "htmldjango", "templ" },
-		},
-		html = {
-			filetypes = {
-				"html",
-				"htmldjango",
-				"templ",
-			},
-			init_options = {
-				provideFormatter = false,
-			},
-		},
-		tinymist = {
-			offset_encoding = "utf-8",
-			settings = {
-				exportPdf = "onType",
-				outputPath = "$root/target/$dir/$name",
-			},
-		},
-		ts_ls = {},
-	},
-}

lua/plugins/avante.lua

@@ -0,0 +1,46 @@
+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

@@ -22,6 +22,7 @@ return {
 				"petertriho/cmp-git",
 				ft = { "gitcommit", "octo", "NeogitCommitMessage" },
 			},
+			-- "milanglacier/minuet-ai.nvim",
 		},
 		version = "*",
 		opts = {
@@ -51,6 +52,7 @@ return {
 				},
 				["<Tab>"] = {},
 				["<S-Tab>"] = {},
+				-- ["<A-y>"] = require("minuet").make_blink_map(),
 			},
 
 			appearance = {
@@ -70,6 +72,7 @@ return {
 					"git",
 					"dbee",
 					"snippets",
+					-- "minuet",
 				},
 				providers = {
 					lazydev = {
@@ -116,6 +119,11 @@ return {
 						module = "blink.compat.source",
 						score_offset = 100,
 					},
+					-- minuet = {
+					-- 	name = "minuet",
+					-- 	module = "minuet.blink",
+					-- 	score_offset = 8, -- Gives minuet higher priority among suggestions
+					-- },
 				},
 			},
 			completion = {
@@ -128,7 +136,9 @@ return {
 				accept = { auto_brackets = { enabled = true } },
 				-- Insert completion item on selection, don't select by default
 				-- list = { selection = "auto_insert" },
-
+				trigger = {
+					prefetch_on_insert = false,
+				},
 				list = {
 					selection = {
 						preselect = function(ctx)

lua/plugins/lspconfig.lua

@@ -9,10 +9,8 @@ return {
 		"folke/neoconf.nvim",
 		"piersolenski/telescope-import.nvim",
 		"mrcjkb/rustaceanvim",
+		"pmizio/typescript-tools.nvim",
 	},
-	opts = function()
-		return require("config.lspconfig-opts")
-	end,
 	config = function(_, opts)
 		require("mason").setup()
 		local lspconfig = require("lspconfig")
@@ -149,7 +147,188 @@ return {
 			},
 			handlers = {
 				default_setup,
+				ts_ls = function() end,
 			},
 		})
 	end,
+
+	opts = {
+		servers = {
+			gopls = {
+				settings = {
+					hints = {
+						rangeVariableTypes = true,
+						parameterNames = true,
+						constantValues = true,
+						assignVariableTypes = true,
+						compositeLiteralFields = true,
+						compositeLiteralTypes = true,
+						functionTypeParameters = true,
+					},
+				},
+			},
+			lua_ls = {
+				settings = {
+					Lua = {
+						runtime = {
+							-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+							version = "LuaJIT",
+						},
+						diagnostics = {
+							-- Get the language server to recognize the `vim` global
+							globals = { "vim", "awesome", "client" },
+						},
+						-- workspace = {
+						-- Make the server aware of Neovim runtime files
+						-- library = vim.api.nvim_get_runtime_file("", true),
+						-- },
+						-- Do not send telemetry data containing a randomized but unique identifier
+						telemetry = {
+							enable = false,
+						},
+						root_pattern = {
+							".stylua.toml",
+							".luarc.json",
+							".luarc.jsonc",
+							".luacheckrc",
+							"stylua.toml",
+							"selene.toml",
+							"selene.yml",
+							".git",
+						},
+						format = {
+							enable = false,
+						},
+						hint = {
+							enable = true,
+						},
+					},
+				},
+			},
+			clangd = {
+				capabilities = {
+					offsetEncoding = { "utf-16" },
+				},
+				settings = {
+					clangd = {
+						InlayHints = {
+							Designators = true,
+							Enabled = true,
+							ParameterNames = true,
+							DeducedTypes = true,
+						},
+						fallbackFlags = { "-std=c++20" },
+					},
+				},
+			},
+			bashls = {
+				filetypes = {
+					"sh",
+					"bash",
+					"zsh",
+				},
+			},
+			emmet_ls = {
+				filetypes = {
+					"html",
+					"htmldjango",
+					"typescriptreact",
+					"javascriptreact",
+					"css",
+					"sass",
+					"scss",
+					"less",
+					"eruby",
+				},
+			},
+			texlab = {
+				texlab = {
+					auxDirectory = ".",
+					bibtexFormatter = "texlab",
+					build = {
+						args = { "-pdf", "-interaction=nonstopmode", "-synctex=1", "%f" },
+						executable = "xelatex",
+						forwardSearchAfter = false,
+						onSave = false,
+					},
+					chktex = {
+						onEdit = false,
+						onOpenAndSave = false,
+					},
+					diagnosticsDelay = 0,
+					formatterLineLength = 120,
+					forwardSearch = {
+						args = {},
+					},
+					latexFormatter = "latexindent",
+					latexindent = {
+						modifyLineBreaks = false,
+					},
+				},
+			},
+			htmx = {
+				filetypes = { "html", "htmldjango", "templ" },
+			},
+			--[[ pylyzer = {
+				settings = {
+					python = {
+						diagnostics = true,
+						inlayHints = true,
+						smartCompletion = true,
+						checkOnType = true,
+					},
+				},
+			}, ]]
+			--[[ basedpyright = {
+				analysis = {
+					autoSearchPaths = true,
+					diagnosticMode = "openFilesOnly",
+					useLibraryCodeForTypes = true,
+				},
+			}, ]]
+			--[[ pylsp = {
+				settings = {
+					pylsp = {
+						plugins = {
+							autopep8 = { enabled = false },
+							flake8 = { enabled = false },
+							pylint = { enabled = false },
+							yapf = { enabled = false },
+							pydocstyle = { enabled = false },
+							mccabe = { enabled = false },
+							rope_autoimport = { enabled = true },
+							rope_completion = {
+								enabled = true,
+								eager = true,
+							},
+							pycodestyle = {
+								maxLineLength = nil,
+							},
+						},
+					},
+				},
+			}, ]]
+			jinja_lsp = {
+				filetypes = { "html", "htmldjango", "templ" },
+			},
+			html = {
+				filetypes = {
+					"html",
+					"htmldjango",
+					"templ",
+				},
+				init_options = {
+					provideFormatter = false,
+				},
+			},
+			tinymist = {
+				offset_encoding = "utf-8",
+				settings = {
+					exportPdf = "onType",
+					outputPath = "$root/target/$dir/$name",
+				},
+			},
+			-- ts_ls = function() end,
+		},
+	},
 }

lua/plugins/minuet.lua

@@ -0,0 +1,26 @@
+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

@@ -1,10 +1,13 @@
 return {
 	{
 		"pmizio/typescript-tools.nvim",
-		dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"neovim/nvim-lspconfig",
+			"saghen/blink.cmp",
+		},
 		ft = { "javascriptreact", "typescriptreact", "javascript", "typescript" },
 		opts = {
-			handlers = {},
 			on_attach = function(client)
 				client.server_capabilities.documentFormattingProvider = false
 				client.server_capabilities.documentRangeFormattingProvider = false