feat: update init config

feat(snipperts): reklwj

df

init.lua

@@ -4,8 +4,23 @@ local vanila_vim_autostart_commands = {
 	"set nowrap",
 	"set shiftwidth=4",
 	"set tabstop=4",
+	"set ttyfast",
 }
 
+vim.o.showcmdloc = "statusline"
+vim.diagnostic.config({
+	virtual_text = true,
+	signs = {
+		text = {
+			[vim.diagnostic.severity.ERROR] = '󰅗 ',
+			[vim.diagnostic.severity.WARN] = '󰀧 ',
+			[vim.diagnostic.severity.INFO] = '󰬐',
+			[vim.diagnostic.severity.HINT] = '󰌵',
+		},
+	}
+})
+
+vim.opt.termguicolors = true
 vim.opt.fillchars = { eob = " " }
 
 for _, cmd in pairs(vanila_vim_autostart_commands) do
@@ -17,29 +32,32 @@ if vim.lsp.inlay_hint then
 end
 
 require("config.lazy")
-require("config.plugins.acmp")
 require("config.plugins.autotag")
 require("config.plugins.autocomplete")
-require("config.plugins.bufferline")
+require("config.plugins.buffer")
 require("config.plugins.colorizer")
 require("config.plugins.comment")
 require("config.plugins.dap")
+require("config.plugins.dropbar")
 require("config.plugins.gitsigns")
 require("config.plugins.ibl")
 require("config.plugins.hover_actions")
 require("config.plugins.lsp_config")
-require("config.plugins.lsp_diagnostic")
 require("config.plugins.lualine")
-require("config.plugins.navic")
 require("config.plugins.noice")
-require("toggleterm").setup()
+require("config.plugins.navic")
+require("toggleterm").setup({
+	direction = "float",
+})
+require("config.plugins.telescope")
 require("config.plugins.treesitter")
 require("config.plugins.neotree")
 require("config.plugins.prettier")
 require("config.plugins.rustaceanvim")
 require("huez").setup({})
-require("config.plugins.dropbar")
-require("config.plugins.dashboard")
+
+vim.api.nvim_set_hl(0, 'WinBar', { link = 'BufferLineCloseButtonSelected' })
+vim.api.nvim_set_hl(0, 'WinBarNC', { link = "BufferLineCloseButtonSelected" })
 
 vim.api.nvim_create_autocmd("BufWritePre", {
 	buffer = buffer,
@@ -47,5 +65,4 @@ vim.api.nvim_create_autocmd("BufWritePre", {
 		vim.lsp.buf.format { async = false }
 	end
 })
-
 require("mappings")

lua/config/plugins/acmp.lua

@@ -1,5 +0,0 @@
--- require'cmp'.setup {
---   sources = {
---     { name = 'nvim_lsp' }
---   }
--- }

lua/config/plugins/autocomplete.lua

@@ -1,4 +1,4 @@
-local cmp = require "cmp"
+local cmp = require("cmp")
 
 local kind_icons = {
 	Text = "",
@@ -28,28 +28,26 @@ local kind_icons = {
 	TypeParameter = "󰅲",
 }
 
-cmp.setup{
+cmp.setup {
 	completion = { completeopt = "menu,menuone" },
 
-  snippet = {
-    expand = function(args)
-      require("luasnip").lsp_expand(args.body)
-    end,
+	window = {
+		completion = {
+			-- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
+			col_offset = -3,
+			side_padding = 0,
+		},
 	},
 
 	formatting = {
+		fields = { "kind", "abbr", "menu" },
 		format = function(entry, vim_item)
-      -- Kind icons
-      vim_item.kind = string.format('\t%s %s\t', kind_icons[vim_item.kind], vim_item.kind) -- This concatenates the icons with the name of the item kind
-      -- Source
-      vim_item.menu = ({
-        buffer = "[Buffer]",
-        nvim_lsp = "[LSP]",
-        luasnip = "[LuaSnip]",
-        nvim_lua = "[Lua]",
-        latex_symbols = "[LaTeX]",
-      })[entry.source.name]
-      return vim_item
+			local kind = require("lspkind").cmp_format({ mode = "symbol_text", maxwidth = 50 })(entry, vim_item)
+			local strings = vim.split(kind.kind, "%s", { trimempty = true })
+			kind.kind = " " .. (strings[1] or "") .. " "
+			kind.menu = "  " .. (strings[2] or "")
+
+			return kind
 		end
 	},
 
@@ -69,8 +67,6 @@ cmp.setup{
 		["<Tab>"] = cmp.mapping(function(fallback)
 			if cmp.visible() then
 				cmp.select_next_item()
-      elseif require("luasnip").expand_or_jumpable() then
-        require("luasnip").expand_or_jump()
 			else
 				fallback()
 			end
@@ -79,8 +75,6 @@ cmp.setup{
 		["<S-Tab>"] = cmp.mapping(function(fallback)
 			if cmp.visible() then
 				cmp.select_prev_item()
-      elseif require("luasnip").jumpable(-1) then
-        require("luasnip").jump(-1)
 			else
 				fallback()
 			end

lua/config/plugins/autotag.lua

@@ -2,6 +2,6 @@ require('nvim-ts-autotag').setup({
 	opts = {
 		enable_close = true,
 		enable_rename = true,
-    enable_close_on_slash = false
+		enable_close_on_slash = true,
 	},
 })

lua/config/plugins/dap.lua

@@ -1,10 +1,10 @@
 local dap = require('dap')
 
 require("dap-vscode-js").setup({
-  debugger_path = "/.local/share/lunarvim/site/pack/lazy/opt/vscode-js-debug",
+	debugger_path = "/.local/share/nvim/site/pack/lazy/opt/vscode-js-debug",
 	debugger_cmd = { "js-debug-adapter" },
 	adapters = { 'node-terminal' },
- })
+})
 
 dap.configurations.cpp = {
 	{
@@ -28,7 +28,7 @@ dap.adapters["pwa-node"] = {
 	port = "${port}",
 	executable = {
 		command = "node",
-    args = {os.getenv("HOME") .. "/.local/share/lvim/mason/packages/js-debug-adapter/js-debug/src/dapDebugServer.js", "${port}"},
+		args = { os.getenv("HOME") .. "/.local/share/nvim/mason/packages/js-debug-adapter/js-debug/src/dapDebugServer.js", "${port}" },
 	}
 }
 
@@ -45,13 +45,13 @@ dap.configurations.javascript = {
 dap.adapters.chrome = {
 	type = "executable",
 	command = "node",
-    args = {os.getenv("HOME") .. "/.local/share/lvim/mason/packages/chrome-debug-adapter/out/src/chromeDebug.js"},
+	args = { os.getenv("HOME") .. "/.local/share/nvim/mason/packages/chrome-debug-adapter/out/src/chromeDebug.js" },
 }
 
 dap.adapters.firefox = {
 	type = 'executable',
 	command = 'node',
-  args = {os.getenv('HOME') .. '/.local/share/lvim/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js'},
+	args = { os.getenv('HOME') .. '/.local/share/nvim/mason/packages/firefox-debug-adapter/dist/adapter.bundle.js' },
 }
 
 dap.configurations.typescriptreact = {
@@ -75,7 +75,7 @@ dap.configurations.typescriptreact = {
 		request = "launch",
 		url = 'http://localhost:3000',
 		webRoot = '${workspaceFolder}',
-      firefoxExecutable = '/usr/bin/waterfox',
+		firefoxExecutable = '/usr/bin/firefox',
 		pathMappings = {
 			{
 				url = "webpack://_n_e/",
@@ -96,4 +96,3 @@ dap.listeners.after.event_initialized["dapui_config"] = function()
 end
 
 vim.keymap.set('n', '<leader>ui', require 'dapui'.toggle)
-

lua/config/plugins/dashboard.lua

@@ -1,31 +0,0 @@
-require('dashboard').setup {
-	theme = 'hyper',
-	config = {
-		week_header = {
-			enable = true,
-		},
-		shortcut = {
-			{ desc = '󰊳 Update', group = '@property', action = 'Lazy update', key = 'u' },
-			{
-				icon = ' ',
-				icon_hl = '@variable',
-				desc = 'Files',
-				group = 'Label',
-				action = 'Telescope find_files',
-				key = 'f',
-			},
-			{
-				desc = ' Apps',
-				group = 'DiagnosticHint',
-				action = 'Telescope app',
-				key = 'a',
-			},
-			{
-				desc = ' dotfiles',
-				group = 'Number',
-				action = 'Telescope dotfiles',
-				key = 'd',
-			},
-		},
-	},
-}

lua/config/plugins/dropbar.lua

@@ -1,4 +1,4 @@
 require('dropbar').setup()
 vim.ui.select = require('dropbar.utils.menu').select
 vim.api.nvim_set_hl(0, 'DropBarMenuHoverEntry', { link = 'PmenuExtraSel' })
-
+vim.api.nvim_set_hl(0, 'WinBarNC', { link = 'Tag' })

lua/config/plugins/eslint.lua

@@ -0,0 +1,19 @@
+eslint.setup({
+	bin = 'eslint', -- or `eslint_d`
+	code_actions = {
+		enable = true,
+		apply_on_save = {
+			enable = true,
+			types = { "directive", "problem", "suggestion", "layout" },
+		},
+		disable_rule_comment = {
+			enable = true,
+			location = "separate_line", -- or `same_line`
+		},
+	},
+	diagnostics = {
+		enable = true,
+		report_unused_disable_directives = false,
+		run_on = "type", -- or `save`
+	},
+})

lua/config/plugins/gitsigns.lua

@@ -44,5 +44,4 @@ require('gitsigns').setup {
 		row = 0,
 		vcol = 1,
 	},
-  yadm = { enable = false },
 }

lua/config/plugins/hover_actions.lua

@@ -1,7 +1,9 @@
 require("hover").setup {
 	init = function()
 		require("hover.providers.lsp")
-		require('hover.providers.diagnostic')
+		require("hover.providers.diagnostic")
+		require("hover.providers.dap")
+		require("hover.providers.dictionary")
 	end,
 	preview_opts = {
 		border = 'single'

lua/config/plugins/lsp_config.lua

@@ -1,5 +1,13 @@
 local lspconfig = require("lspconfig")
 
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
+	vim.lsp.diagnostic.on_publish_diagnostics, {
+		virtual_text = true
+	}
+)
+
+lspconfig.clangd.setup({})
+
 lspconfig.lua_ls.setup({
 	settings = {
 		Lua = {
@@ -20,30 +28,26 @@ lspconfig.eslint.setup({
 	}
 })
 
+vim.lsp.enable('tailwindcss')
+
+lspconfig.tailwindcss.setup({})
+
 lspconfig.ts_ls.setup({
 	settings = {
 		typescript = {
 			inlayHints = {
 				includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
-        includeInlayParameterNameHintsWhenArgumentMatchesName = false,
 				includeInlayFunctionParameterTypeHints = true,
 				includeInlayVariableTypeHints = true,
-        includeInlayVariableTypeHintsWhenTypeMatchesName = false,
 				includeInlayPropertyDeclarationTypeHints = true,
-        includeInlayFunctionLikeReturnTypeHints = true,
-        includeInlayEnumMemberValueHints = true,
 			},
 		},
 		javascript = {
 			inlayHints = {
 				includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
-        includeInlayParameterNameHintsWhenArgumentMatchesName = false,
-        includeInlayVariableTypeHints = true,
 				includeInlayFunctionParameterTypeHints = true,
-        includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+				includeInlayVariableTypeHints = true,
 				includeInlayPropertyDeclarationTypeHints = true,
-        includeInlayFunctionLikeReturnTypeHints = true,
-        includeInlayEnumMemberValueHints = true,
 			},
 		},
 	}

lua/config/plugins/lsp_diagnostic.lua

@@ -1,5 +0,0 @@
-local signs = { Error = " ", Warn = " ", Hint = "󱩎 ", Info = " " }
-for type, icon in pairs(signs) do
-  local hl = "DiagnosticSign" .. type
-  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-end

lua/config/plugins/lualine.lua

@@ -1,9 +1,11 @@
+local _colors = { "DiffAdd", "DiffChange", "RedrawDebugRecompose" }
+
 require("lualine").setup({
 	options = {
 		icons_enabled = true,
 		theme = 'auto',
-    component_separators = { left = '', right = ''},
-    section_separators = { left = '', right = ''},
+		component_separators = { left = '', right = '' },
+		section_separators = { left = '', right = '' },
 		disabled_filetypes = {
 			statusline = {},
 			winbar = {},
@@ -29,11 +31,42 @@ require("lualine").setup({
 				cond = nil,
 			},
 		},
-    lualine_b = {'branch'},
-    lualine_c = {'diff'},
-    lualine_x = {'encoding', 'filetype', 'diagnostics', 'lsp'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
+		lualine_b = { 'branch' },
+		lualine_c = {
+			{
+				'diff',
+				colored = true, -- Displays a colored diff status if set to true
+				symbols = { added = ' ', modified = ' ', removed = ' ' }, -- Changes the symbols used by the diff.
+				source = nil, -- A function that works as a data source for diff.
+			}
+		},
+		lualine_x = { '%S', 'encoding', 'filetype',
+			{
+				'diagnostics',
+
+				sources = { 'nvim_diagnostic', 'coc' },
+
+				sections = { 'error', 'warn', 'info', 'hint' },
+
+				diagnostics_color = {
+					error = 'DiagnosticError', -- Changes diagnostics' error color.
+					warn  = 'DiagnosticWarn', -- Changes diagnostics' warn color.
+					info  = 'DiagnosticInfo', -- Changes diagnostics' info color.
+					hint  = 'DiagnosticHint', -- Changes diagnostics' hint color.
+				},
+				symbols = {
+					hint = '󰌵 ',
+					info = '󰬐 ',
+					warn = '󰀧 ',
+					error = '󰅗 ',
+				},
+				colored = true, -- Displays diagnostics status in color if set to true.
+				update_in_insert = false, -- Update diagnostics in insert mode.
+				always_visible = false, -- Show diagnostics even if there are none.
+			}
+		},
+		lualine_y = { 'progress' },
+		lualine_z = { 'location' }
 	},
 	inactive_sections = {
 		lualine_a = {
@@ -46,11 +79,11 @@ require("lualine").setup({
 				cond = nil,
 			},
 		},
-    lualine_b = {'branch'},
-    lualine_c = {'diff'},
-    lualine_x = {'encoding', 'filetype', 'diagnostics', 'lsp'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
+		lualine_b = { 'branch' },
+		lualine_c = {},
+		lualine_x = { 'encoding', 'filetype', 'diagnostics', 'lsp' },
+		lualine_y = { 'progress' },
+		lualine_z = { 'location' }
 	},
 	tabline = {},
 	winbar = {},

lua/config/plugins/luasnip.lua

@@ -1,22 +0,0 @@
--- vscode format
-require("luasnip.loaders.from_vscode").lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
-require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
-
--- snipmate format
-require("luasnip.loaders.from_snipmate").load()
-require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
-
--- lua format
-require("luasnip.loaders.from_lua").load()
-require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
-
-vim.api.nvim_create_autocmd("InsertLeave", {
-  callback = function()
-    if
-      require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
-      and not require("luasnip").session.jump_active
-    then
-      require("luasnip").unlink_current()
-    end
-  end,
-})

lua/config/plugins/navic.lua

@@ -44,4 +44,3 @@ navic.setup {
 		return text
 	end,
 }
-

lua/config/plugins/neotree.lua

@@ -1,21 +1,34 @@
-vim.fn.sign_define("LspDiagnosticsSignError",
-        {text = "󰅙 ", texthl = "LspDiagnosticsSignError"})
-vim.fn.sign_define("LspDiagnosticsSignWarning",
-        {text = "󱇎 ", texthl = "LspDiagnosticsSignWarning"})
-vim.fn.sign_define("LspDiagnosticsSignInformation",
-        {text = "󰰄 ", texthl = "LspDiagnosticsSignInformation"})
-vim.fn.sign_define("LspDiagnosticsSignHint",
-        {text = "󰐗 ", texthl = "LspDiagnosticsSignHint"})
-
 require("neo-tree").setup({
 	close_if_last_window = false,
-  popup_border_style = "rounded",
 	enable_git_status = true,
 	enable_diagnostics = true,
+	source_selector = {
+		separator = { left = "", right = "" },
+		separator_active = false,
+		show_separator_on_edge = false,
+	},
+	popup_border_style = "NC",
 	open_files_do_not_replace_types = { "terminal", "trouble", "qf" },
 	sort_case_insensitive = false,
-  sort_function = nil ,
+	sort_function = nil,
+	window = {
+		separator_position = "left",
+	},
 	default_component_configs = {
+		diagnostics = {
+			symbols = {
+				hint = '󰌵',
+				info = '󰬐',
+				warn = '󰀧',
+				error = '󰅗',
+			},
+			highlights = {
+				hint = "DiagnosticSignHint",
+				info = "DiagnosticSignInfo",
+				warn = "DiagnosticSignWarn",
+				error = "DiagnosticSignError",
+			},
+		},
 		indent = {
 			with_expanders = true,
 		},

lua/config/plugins/noice.lua

@@ -12,4 +12,16 @@ require("noice").setup({
 		inc_rename = false,     -- enables an input dialog for inc-rename.nvim
 		lsp_doc_border = false, -- add a border to hover docs and signature help
 	},
+	views = {
+		cmdline_popup = {
+			border = {
+				style = "none",
+				padding = { 1, 2 },
+			},
+			filter_options = {},
+			win_options = {
+				winhighlight = "NormalFloat:NormalFloat,FloatBorder:FloatBorder",
+			},
+		},
+	},
 })

lua/config/plugins/nvimufo.lua

@@ -1,61 +0,0 @@
-vim.o.foldcolumn = "auto:9"
-vim.o.foldlevel = 99
-vim.o.foldlevelstart = 99
-vim.o.foldenable = true
-vim.o.fillchars = [[eob: ,fold: ,foldopen:󰅀,foldsep:│,foldclose:󰅂]]
-
-vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
-vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
-
-local handler = function(virtText, lnum, endLnum, width, truncate)
-	local newVirtText = {}
-	local totalLines = vim.api.nvim_buf_line_count(0)
-	local foldedLines = endLnum - lnum
-	local suffix = ("  %d %d%%"):format(foldedLines, foldedLines / totalLines * 100)
-	local sufWidth = vim.fn.strdisplaywidth(suffix)
-	local targetWidth = width - sufWidth
-	local curWidth = 0
-	for _, chunk in ipairs(virtText) do
-		local chunkText = chunk[1]
-		local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-		if targetWidth > curWidth + chunkWidth then
-			table.insert(newVirtText, chunk)
-		else
-			chunkText = truncate(chunkText, targetWidth - curWidth)
-			local hlGroup = chunk[2]
-			table.insert(newVirtText, { chunkText, hlGroup })
-			chunkWidth = vim.fn.strdisplaywidth(chunkText)
-			-- str width returned from truncate() may less than 2nd argument, need padding
-			if curWidth + chunkWidth < targetWidth then
-				suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
-			end
-			break
-		end
-		curWidth = curWidth + chunkWidth
-	end
-	local rAlignAppndx =
-		math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
-	suffix = (" "):rep(rAlignAppndx) .. suffix
-	table.insert(newVirtText, { suffix, "MoreMsg" })
-	return newVirtText
-end
-
-require('ufo').setup({
-	fold_virt_text_handler = handler,
-	open_fold_hl_timeout = 400,
-	preview = {
-		win_config = {
-			border = { "", "─", "", "", "", "─", "", "" },
-			winblend = 0,
-		},
-		mappings = {
-			scrollU = "<C-u>",
-			scrollD = "<C-d>",
-			jumpTop = "[",
-			jumpBot = "]",
-		},
-	},
-	provider_selector = function(bufnr, filetype, buftype)
-		return { 'treesitter', 'indent' }
-	end
-})

lua/config/plugins/rustaceanvim.lua

@@ -1,34 +1,36 @@
 local navic = require("nvim-navic")
 
 vim.g.rustaceanvim = {
-	tools = {
-		autoSetHints = true,
-		inlay_hints = {
-			show_parameter_hints = true,
-			parameter_hints_prefix = "in: ", -- "<- "
-			other_hints_prefix = "out: " -- "=> "
-		}
-	},
 	server = {
 		on_attach = function(client, bufnr)
 			navic.attach(client, bufnr)
 		end,
 		settings = {
 			['rust-analyzer'] = {
+				numThreads = 6,
+				cachePriming = {
+					numThreads = false
+				},
 				assist = {
 					importEnforceGranularity = true,
 					importPrefix = "create"
 				},
-				cargo = { allFeatures = true },
+				cargo = {
+					allFeatures = true,
+				},
 				checkOnSave = {
 					command = "clippy",
 					allFeatures = true
 				},
-				inlayHints = {
-					lifetimeElisionHints = {
+				procMacro = {
 					enable = true,
-						useParameterNames = true
-					}
+				},
+				inlayHints = {
+					parameterHints = false,
+					lifetimeElisionHints = false,
+					chainingHints = false,
+					bindingModeHints = false,
+					renderColons = false,
 				}
 			}
 		}

lua/config/plugins/telescope.lua

@@ -0,0 +1,86 @@
+require("telescope").load_extension("ui-select")
+
+require("telescope").setup({
+	defaults = {
+		borderchars = { " ", " ", " ", " ", " ", " ", " ", " " }
+	},
+	extensions = {
+		["ui-select"] = {
+			require("telescope.themes").get_dropdown {
+				-- even more opts
+			}
+
+			-- pseudo code / specification for writing custom displays, like the one
+			-- for "codeactions"
+			-- specific_opts = {
+			--   [kind] = {
+			--     make_indexed = function(items) -> indexed_items, width,
+			--     make_displayer = function(widths) -> displayer
+			--     make_display = function(displayer) -> function(e)
+			--     make_ordinal = function(e) -> string
+			--   },
+			--   -- for example to disable the custom builtin "codeactions" display
+			--      do the following
+			--   codeactions = false,
+			-- }
+		}
+	}
+})
+
+local blend = 50
+
+vim.api.nvim_create_autocmd("FileType", {
+	pattern = "TelescopePrompt",
+	callback = function(ctx)
+		local backdropName = "TelescopeBackdrop"
+		local telescopeBufnr = ctx.buf
+
+		-- `Telescope` does not set a zindex, so it uses the default value
+		-- of `nvim_open_win`, which is 50: https://neovim.io/doc/user/api.html#nvim_open_win()
+		local telescopeZindex = 50
+
+		local backdropBufnr = vim.api.nvim_create_buf(false, true)
+		local winnr = vim.api.nvim_open_win(backdropBufnr, false, {
+			relative = "editor",
+			border = "none",
+			row = 0,
+			col = 0,
+			width = vim.o.columns,
+			height = vim.o.lines,
+			focusable = false,
+			style = "minimal",
+			zindex = telescopeZindex - 1, -- ensure it's below the reference window
+		})
+
+		vim.api.nvim_set_hl(0, backdropName, { bg = "#000000", default = true })
+		vim.wo[winnr].winhighlight = "Normal:" .. backdropName
+		vim.wo[winnr].winblend = blend
+		vim.bo[backdropBufnr].buftype = "nofile"
+
+		-- close backdrop when the reference buffer is closed
+		vim.api.nvim_create_autocmd({ "WinClosed", "BufLeave" }, {
+			once = true,
+			buffer = telescopeBufnr,
+			callback = function()
+				if vim.api.nvim_win_is_valid(winnr) then vim.api.nvim_win_close(winnr, true) end
+				if vim.api.nvim_buf_is_valid(backdropBufnr) then
+					vim.api.nvim_buf_delete(backdropBufnr, { force = true })
+				end
+			end,
+		})
+	end,
+})
+
+vim.api.nvim_create_autocmd({ "ColorScheme", "VimEnter" }, {
+	group = vim.api.nvim_create_augroup('Color', {}),
+	pattern = "*",
+	callback = function()
+		vim.api.nvim_set_hl(0, "TelescopePreviewTitle", { link = "MiniStatuslineModeVisual" })
+		vim.api.nvim_set_hl(0, "TelescopePromptTitle", { link = "MiniStatuslineModeCommand" })
+		vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { link = "MiniStatuslineModeReplace" })
+		vim.api.nvim_set_hl(0, "TelescopePromptNormal", { link = "StatusLine" })
+		vim.api.nvim_set_hl(0, "TelescopePromptBorder", { link = "StatusLine" })
+		vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { link = "BufferLineHint" })
+		vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { link = "BufferLineHint" })
+	end
+})

lua/config/plugins/treesitter.lua

@@ -1,8 +1,11 @@
-require'nvim-treesitter.configs'.setup {
+require 'nvim-treesitter.configs'.setup {
 	ensure_installed = { 'rust', 'c', 'lua', 'tsx', 'javascript', 'typescript' },
 	sync_install = false,
 	auto_install = true,
 	highlight = {
 		enable = true,
+	},
+	autotag = {
+		enable = true,
 	}
 }

lua/mappings.lua

@@ -1,4 +1,4 @@
-local map = vim.keymap.set
+local map = vim.keymap.set;
 
 local bl_utils = require("config.utils.bufferline")
 local hover = require "hover"
@@ -32,15 +32,13 @@ map("n", "ca", "<cmd>RustLsp codeAction<cr>")
 map("n", "<C-s>", "<cmd>w!<cr>")
 map("i", "<C-s>", "<cmd>w!<cr>")
 
-map("n", "<", "<cmd><gv<cr>")
-map("n", ">", "<cmd>>gv<cr>")
+map("n", "<C-f>", "<C-q>")
+map("i", "<C-f>", "<C-q>")
 
 map("n", "<leader>c", function(bufnr)
 	bl_utils.buf_kill("bd", bufnr, true)
 end)
 
-map("n", "<leader>dr", "<cmd> DapContinue <cr>", { desc = "Continue debug" })
-
 map("n", "do", function()
 	require("dapui").open()
 end, { desc = "Open DAP ui" })
@@ -53,15 +51,18 @@ end, { desc = "Toggle DAP ui" })
 
 map("n", "<A-j>", "<cmd>m .+1<CR>==")
 map("n", "<A-k>", "<cmd>m .-2<CR>==")
-map("i", "<A-j>", "<Esc><cmd>m .+1<CR>==gi")
-map("i", "<A-k>", "<Esc><cmd>m .-2<CR>==gi")
+map("i", "<A-j>", "<Esc><cmd>m .+1<CR>==gi<cr>")
+map("i", "<A-k>", "<Esc><cmd>m .-2<CR>==gi<cr>")
+
+map("v", "<Tab>", ">gv")
+map("v", "<S-Tab>", "<gv")
 
 map("n", "<C-Up>", "<cmd>resize -2<CR>")
 map("n", "<C-Down>", "<cmd>resize +2<CR>")
 map("n", "<C-Right>", "<cmd>vertical resize -2<CR>")
 map("n", "<C-Left>", "<cmd>vertical resize +2<CR>")
 
-map("n", "<leader>an", "<cmd>set norelativenumber<cr>")
+map("n", "<leader>nn", "<cmd>set norelativenumber<cr>")
 map("n", "<leader>rn", "<cmd>set relativenumber<cr>")
 map("n", "tt", "<cmd>ToggleTerm<cr>")
 map("n", "<C-{>", "<cmd>foldopen<cr>")

lua/plugins/core/init.lua

@@ -2,12 +2,18 @@ return {
 	{
 		'simrat39/inlay-hints.nvim',
 	},
+	{
+		'nvim-telescope/telescope-ui-select.nvim'
+	},
 	{
 		"LunarVim/breadcrumbs.nvim",
 	},
 	{
 		"akinsho/bufferline.nvim",
 	},
+	{
+		"onsails/lspkind.nvim"
+	},
 	{
 		"lewis6991/gitsigns.nvim"
 	},
@@ -23,15 +29,15 @@ return {
 	{
 		'kevinhwang91/promise-async',
 	},
+	{
+		"SmiteshP/nvim-navic",
+	},
 	{
 		'theHamsta/nvim-dap-virtual-text',
 	},
 	{
 		"hrsh7th/cmp-nvim-lsp",
 	},
-	{
-		"SmiteshP/nvim-navic",
-	},
 	{
 		"kyazdani42/nvim-web-devicons"
 	},
@@ -44,9 +50,6 @@ return {
 	{
 		"nvim-treesitter/nvim-treesitter",
 	},
-	{
-		"catppuccin/nvim"
-	},
 	{
 		"vague2k/huez.nvim",
 	},
@@ -71,26 +74,13 @@ return {
 		'folke/lazydev.nvim',
 		ft = "lua",
 	},
-	{
-		'Bekaboo/dropbar.nvim',
-		dependencies = {
-			'nvim-telescope/telescope-fzf-native.nvim',
-			build = 'make'
-		},
-		config = function()
-			local dropbar_api = require('dropbar.api')
-			vim.keymap.set('n', '<Leader>;', dropbar_api.pick, { desc = 'Pick symbols in winbar' })
-			vim.keymap.set('n', '[;', dropbar_api.goto_context_start, { desc = 'Go to start of current context' })
-			vim.keymap.set('n', '];', dropbar_api.select_next_context, { desc = 'Select next context' })
-		end
-	},
 	{
 		"folke/noice.nvim",
 		event = "VeryLazy",
 		dependencies = {
+			-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
 			"MunifTanjim/nui.nvim",
-			"rcarriga/nvim-notify",
-		},
+		}
 	},
 	{
 		"nvim-neo-tree/neo-tree.nvim",
@@ -124,21 +114,24 @@ return {
 			require("dapui").setup()
 		end
 	},
+	{
+		'Bekaboo/dropbar.nvim',
+		dependencies = {
+			'nvim-telescope/telescope-fzf-native.nvim',
+			build = 'make'
+		},
+		config = function()
+			local dropbar_api = require('dropbar.api')
+			vim.keymap.set('n', '<Leader>;', dropbar_api.pick, { desc = 'Pick symbols in winbar' })
+			vim.keymap.set('n', '[;', dropbar_api.goto_context_start, { desc = 'Go to start of current context' })
+			vim.keymap.set('n', '];', dropbar_api.select_next_context, { desc = 'Select next context' })
+		end
+	},
 	{
 		"hrsh7th/nvim-cmp",
 		event = "InsertEnter",
 		dependencies = {
 			{
-				"L3MON4D3/LuaSnip",
-				dependencies = "rafamadriz/friendly-snippets",
-				opts = { history = true, updateevents = "TextChanged,TextChangedI" },
-				config = function(_, opts)
-					require("luasnip").config.set_config(opts)
-					require "config.plugins.luasnip"
-				end,
-			},
-			{
-				"saadparwaiz1/cmp_luasnip",
 				"hrsh7th/cmp-nvim-lua",
 				"hrsh7th/cmp-nvim-lsp",
 				"hrsh7th/cmp-buffer",

lua/plugins/secondary/init.lua

@@ -1,8 +1,11 @@
 return {
 	{
-		'nvimdev/dashboard-nvim',
-		event = 'VimEnter',
-		dependencies = { { 'nvim-tree/nvim-web-devicons' } }
+		"catppuccin/nvim",
+		name = "catppuccin",
+		priority = 1000
+	},
+	{
+		"nvim-treesitter/playground"
 	},
 	{
 		"kaarmu/typst.vim",
@@ -13,7 +16,8 @@ return {
 		lazy = true,
 	},
 	{
-		"savq/melange-nvim"
+		'MunifTanjim/eslint.nvim',
+		lazy = true,
 	},
 	{
 		'akinsho/toggleterm.nvim', version = "*", config = true
@@ -27,7 +31,14 @@ return {
 		lazy = true,
 	},
 	{
-		"lukas-reineke/indent-blankline.nvim"
+		"lukas-reineke/indent-blankline.nvim",
+		main = "ibl",
+	},
+	{
+		"sainnhe/gruvbox-material",
+	},
+	{
+		"savq/melange-nvim"
 	},
 	{
 		"mxsdev/nvim-dap-vscode-js",
@@ -45,10 +56,8 @@ return {
 		build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out"
 	},
 	{
-		"mrcjkb/rustaceanvim",
-		version = '^4', -- Recommended
+		'mrcjkb/rustaceanvim',
+		version = '^6', -- Recommended
 		lazy = false, -- This plugin is already lazy
-		ft = { "rust" },
-	},
-
+	}
 }