blink stuff

config/.config/nvim/lazy-lock.json

@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }
+  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }
 }

vim/.vim/lua/plugins/blink.lua

@@ -21,8 +21,6 @@ return {
 		dependencies = {
 			"Exafunction/codeium.nvim",
 			"mikavilpas/blink-ripgrep.nvim",
-      "hrsh7th/cmp-cmdline",
-      -- "FelipeLema/cmp-async-path",
 			"chrisgrieser/cmp-nerdfont",
 			"hrsh7th/cmp-emoji",
 			"rafamadriz/friendly-snippets", -- optional: provides snippets for the snippet source
@@ -52,7 +50,6 @@ return {
 					local providerToEnable = {
 						"lsp",
 						"path",
-            "crates",
 						"snippets",
 						"ripgrep",
 						"emoji",
@@ -65,15 +62,11 @@ return {
 					else
 						table.insert(providerToEnable, "codeium")
 					end
-          vim.notify("BOOOOOOP")
-          vim.notify(vim.inspect(providerToEnable))
 					return providerToEnable
 				end,
-      },
 				providers = {
 					-- dont show LuaLS require statements when lazydev has items
-        lsp = { fallback_for = { "lazydev" } },
+					lazydev = { name = "LazyDev", module = "lazydev.integrations.blink", fallbacks = { "lsp" } },
-        lazydev = { name = "LazyDev", module = "lazydev.integrations.blink" },
 					ripgrep = {
 						module = "blink-ripgrep",
 						name = "Ripgrep",
@@ -99,10 +92,47 @@ return {
 						name = "codeium",
 						module = "blink.compat.source",
 					},
+					emoji = {
+						name = "emoji",
+						module = "blink.compat.source",
+					},
+					nerdfont = {
+						name = "nerdfont",
+						module = "blink.compat.source",
+					},
+				},
 			},
 			-- experimental signature help support
 			signature = { enabled = true },
 			completion = {
+				menu = {
+					draw = {
+						components = {
+							kind_icon = {
+								ellipsis = false,
+								text = function(ctx)
+									local kind_icon, _, _ = require("mini.icons").get("lsp", ctx.kind)
+									return kind_icon
+								end,
+								-- Optionally, you may also use the highlights from mini.icons
+								highlight = function(ctx)
+									local _, hl, _ = require("mini.icons").get("lsp", ctx.kind)
+									return hl
+								end,
+							},
+						},
+					},
+				},
+				list = {
+					selection = {
+						preselect = function(ctx)
+							return ctx.mode ~= "cmdline"
+						end,
+						auto_insert = function(ctx)
+							return ctx.mode ~= "cmdline"
+						end,
+					},
+				},
 				trigger = {
 					show_on_x_blocked_trigger_characters = { "'", '"', "(", "{" },
 				},

vim/.vim/lua/plugins/cmp.lua

@@ -1,11 +1,11 @@
-local use_google = require("utils").use_google
+local use_google = require("utils").use_googlecmp
 local flags = require("utils").flags
 
 return {
 	{
 		"hrsh7th/nvim-cmp",
 		event = { "InsertEnter", "CmdlineEnter" },
-    cond = use_google(),
+		cond = not flags.blink,
 		dependencies = {
 			"Exafunction/codeium.nvim",
 			"FelipeLema/cmp-async-path",

vim/.vim/lua/plugins/lsp.lua

@@ -73,7 +73,6 @@ return {
 			})
 			-- Run gofmt + goimports on save
 
-<<<<<<< HEAD
 			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
 			vim.api.nvim_create_autocmd("BufWritePre", {
 				pattern = "*.go",
@@ -111,45 +110,6 @@ return {
 		config = function()
 			local lsp_status = require("lsp-status")
 			lsp_status.register_progress()
-=======
-			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
-			vim.api.nvim_create_autocmd("BufWritePre", {
-				pattern = "*.go",
-				callback = function()
-					require("go.format").goimports()
-				end,
-				group = format_sync_grp,
-			})
-		end,
-		ft = { "go", "gomod" },
-		build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
-	},
-	{
-		"neovim/nvim-lspconfig",
-		dependencies = {
-			"hrsh7th/nvim-cmp",
-			"nvim-lua/lsp-status.nvim",
-			"VonHeikemen/lsp-zero.nvim",
-		},
-		keys = {
-			{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" },
-			{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
-			{ "L", ":lua vim.lsp.buf.hover()<CR>" },
-			{ "gr", ":Telescope lsp_references<CR>" },
-			{ "gd", ":lua vim.lsp.buf.definition()<CR>" },
-			-- { "gd", "<cmd>Telescope lsp_definitions<CR>" },
-			{ "gD", ":tab split | lua vim.lsp.buf.definition()<CR>" },
-			{ "gi", ":lua vim.lsp.buf.implementation()<CR>" },
-			{ "gI", ":lua vim.lsp.buf.implementation()<CR>" },
-			{ "gR", ":lua vim.lsp.buf.references()<CR>" },
-			{ "gt", ":lua vim.lsp.buf.type_definition()<CR>" },
-			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>" },
-			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
-		},
-		config = function()
-			local lsp_status = require("lsp-status")
-			lsp_status.register_progress()
->>>>>>> cc84d4d (i dont even know)
 
 			local capabilities = flags.blink
 					and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())

vim/.vim/lua/utils.lua

@@ -1,6 +1,6 @@
 local M = {
 	use_google_cache = nil,
-  flags = {},
+	flags = { blink = true },
 }
 
 function M.exec(command, args)