feat: update init config

feat(snipperts): reklwj

df

init.lua

@@ -1,26 +1,68 @@
-vim.cmd("set number")
+local vanila_vim_autostart_commands = {
+	"set number",
+	"set clipboard=unnamedplus",
+	"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
+	vim.cmd(cmd)
+end
+
+if vim.lsp.inlay_hint then
+	vim.lsp.inlay_hint.enable(true, { 0 })
+end
 
 require("config.lazy")
-
-require("mappings")
-
-require("config.plugins.acmp")
 require("config.plugins.autotag")
-require("config.plugins.autocommand")
+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("ibl").setup()
+require("config.plugins.ibl")
+require("config.plugins.hover_actions")
+require("config.plugins.lsp_config")
 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.nvimufo")
 require("config.plugins.prettier")
-require("config.plugins.winbar")
+require("config.plugins.rustaceanvim")
 require("huez").setup({})
+
+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,
+	callback = function()
+		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/autocommand.lua

@@ -1,13 +0,0 @@
-vim.api.nvim_create_autocmd(
-    {
-        "BufNewFile",
-        "BufRead",
-    },
-    {
-        pattern = "*.typ",
-        callback = function()
-            local buf = vim.api.nvim_get_current_buf()
-            vim.api.nvim_buf_set_option(buf, "filetype", "typst")
-        end
-    }
-)

lua/config/plugins/autocomplete.lua

@@ -0,0 +1,89 @@
+local cmp = require("cmp")
+
+local kind_icons = {
+	Text = "",
+	Method = "󰆧",
+	Function = "󰊕",
+	Constructor = "",
+	Field = "",
+	Variable = "",
+	Class = "",
+	Interface = "",
+	Module = "",
+	Property = "󰜢",
+	Unit = "",
+	Value = "󰎠",
+	Enum = "",
+	Keyword = "󰌋",
+	Snippet = "",
+	Color = "󰏘",
+	File = "󰈙",
+	Reference = "",
+	Folder = "󰉋",
+	EnumMember = "",
+	Constant = "󰏿",
+	Struct = "",
+	Event = "",
+	Operator = "󰆕",
+	TypeParameter = "󰅲",
+}
+
+cmp.setup {
+	completion = { completeopt = "menu,menuone" },
+
+	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)
+			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
+	},
+
+	mapping = {
+		["<C-p>"] = cmp.mapping.select_prev_item(),
+		["<C-n>"] = cmp.mapping.select_next_item(),
+		["<C-d>"] = cmp.mapping.scroll_docs(-4),
+		["<C-f>"] = cmp.mapping.scroll_docs(4),
+		["<C-Space>"] = cmp.mapping.complete(),
+		["<C-e>"] = cmp.mapping.close(),
+
+		["<CR>"] = cmp.mapping.confirm {
+			behavior = cmp.ConfirmBehavior.Insert,
+			select = true,
+		},
+
+		["<Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_next_item()
+			else
+				fallback()
+			end
+		end, { "i", "s" }),
+
+		["<S-Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_prev_item()
+			else
+				fallback()
+			end
+		end, { "i", "s" }),
+	},
+
+	sources = {
+		{ name = "nvim_lsp" },
+		{ name = "buffer" },
+		{ name = "path" },
+	},
+}

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/buffer.lua

@@ -0,0 +1,89 @@
+vim.opt.termguicolors = true
+
+local utils = require("config.utils.bufferline")
+
+require("bufferline").setup({
+	highlights = {
+		background = {
+			italic = false,
+		},
+		buffer_selected = {
+			bold = true,
+		},
+	},
+	options = {
+		themable = true,
+		get_element_icon = nil,
+		show_duplicate_prefix = true,
+		duplicates_across_groups = true,
+		auto_toggle_bufferline = true,
+		move_wraps_at_ends = false,
+		groups = { items = {}, options = { toggle_hidden_on_enter = true } },
+		mode = "buffers",
+		numbers = "none",
+		close_command = function(bufnr)
+			utils.buf_kill("bd", bufnr, false)
+		end,
+		right_mouse_command = "vert sbuffer %d",
+		left_mouse_command = "buffer %d",
+		middle_mouse_command = nil,
+		name_formatter = function(buf)
+			if buf.name:match "%.md" then
+				return vim.fn.fnamemodify(buf.name, ":t:r")
+			end
+		end,
+		max_name_length = 18,
+		max_prefix_length = 15,
+		truncate_names = true,
+		tab_size = 18,
+		diagnostics = "nvim_lsp",
+		diagnostics_update_in_insert = false,
+		custom_filter = utils.custom_filter,
+		offsets = {
+			{
+				filetype = "undotree",
+				text = "Undotree",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+			{
+				filetype = "NvimTree",
+				text = "Explorer",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+			{
+				filetype = "DiffviewFiles",
+				text = "Diff View",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+			{
+				filetype = "flutterToolsOutline",
+				text = "Flutter Outline",
+				highlight = "PanelHeading",
+			},
+			{
+				filetype = "lazy",
+				text = "Lazy",
+				highlight = "PanelHeading",
+				padding = 1,
+			},
+		},
+		color_icons = true,
+		show_close_icon = false,
+		show_tab_indicators = true,
+		persist_buffer_sort = true,
+		separator_style = "thin",
+		enforce_regular_tabs = false,
+		always_show_bufferline = false,
+		hover = {
+			enabled = false,
+			delay = 200,
+			reveal = { "close" },
+		},
+		sort_by = "id",
+		debug = { logging = false },
+	},
+
+})

lua/config/plugins/bufferline.lua

@@ -1,27 +0,0 @@
-vim.opt.termguicolors = true
-
-require("bufferline").setup({
-  highlights = {
-    background = {
-      italic = false,
-    },
-    buffer_selected = {
-      bold = true,
-    },
-  },
-  options = {
-    mode = "buffers",
-    persist_buffer_sort = true,
-    enforce_regular_tabs = false,
-    always_show_bufferline = false,    
-    offsets = {
-      {
-        filetype = "NeoTree",
-        text = "File Explorer",
-        highlight = "Directory",
-        separator = true,
-      }
-    }
-  }
-})
-

lua/config/plugins/comment.lua

@@ -1,43 +1,10 @@
-require("Comment").setup({
+require('Comment').setup({
-    ---Add a space b/w comment and the line
     padding = true,
-    ---Whether the cursor should stay at its position
     sticky = true,
-    ---Lines to be ignored while (un)comment
-    ignore = nil,
-    ---LHS of toggle mappings in NORMAL mode
     toggler = {
-        ---Line-comment toggle keymap
         line = '<leader>/',
-        ---Block-comment toggle keymap
-        block = '<leader>/',
     },
-    ---LHS of operator-pending mappings in NORMAL and VISUAL mode
     opleader = {
-        ---Line-comment keymap
+        line = '<leader>/',
-        line = 'gc',
-        ---Block-comment keymap
-        block = 'gb',
     },
-    ---LHS of extra mappings
-    extra = {
-        ---Add comment on the line above
-        above = 'gcO',
-        ---Add comment on the line below
-        below = 'gco',
-        ---Add comment at the end of line
-        eol = 'gcA',
-    },
-    ---Enable keybindings
-    ---NOTE: If given `false` then the plugin won't create any mappings
-    mappings = {
-        ---Operator-pending mapping; `gcc` `gbc` `gc[count]{motion}` `gb[count]{motion}`
-        basic = true,
-        ---Extra mapping; `gco`, `gcO`, `gcA`
-        extra = true,
-    },
-    ---Function to call before (un)comment
-    pre_hook = nil,
-    ---Function to call after (un)comment
-    post_hook = nil,
 })

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/dropbar.lua

@@ -1,30 +1,4 @@
-local sources = require("dropbar.sources")
+require('dropbar').setup()
-
+vim.ui.select = require('dropbar.utils.menu').select
-local function get_hl_color(group, attr)
+vim.api.nvim_set_hl(0, 'DropBarMenuHoverEntry', { link = 'PmenuExtraSel' })
-  return vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID(group)), attr)
+vim.api.nvim_set_hl(0, 'WinBarNC', { link = 'Tag' })
-end
-
-vim.cmd [[hi WinBar guisp=#665c54 guibg=#313131]]
-vim.cmd [[hi WinBarNC guisp=#665c54 guibg=#313131]]
-
-require("dropbar").setup(
-  {
-    bar = {
-      sources = {
-        {
-          get_symbols = function(buf, win, cursor)
-            local symbols = sources.path.get_symbols(buf, win, cursor)
-            for _, symbol in ipairs(symbols) do
-              local icon_fg = get_hl_color(symbol.icon_hl, "fg#")
-
-              local icon_string = ""
-
-              vim.cmd(icon_string)
-            end
-            return symbols
-          end
-        }
-      }
-    }
-  }
-)

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

@@ -1,37 +1,19 @@
-require("gitsigns").setup({
+require('gitsigns').setup {
 	signs = {
-    add = {
+		add          = { text = '┃' },
-      text = " ┃",
+		change       = { text = '┃' },
-    },
+		delete       = { text = '' },
-    change = {
+		topdelete    = { text = '' },
-      text = " ┃",
+		changedelete = { text = '┃' },
-    },
+		untracked    = { text = ' ' },
-    delete = {
-      text = " ",
-    },
-    topdelete = {
-      text = " ",
-    },
-    changedelete = {
-      text = " ┃",
-    },
 	},
 	signs_staged = {
-    add = {
+		add          = { text = '┃' },
-      text = " ┃",
+		change       = { text = '┃' },
-    },
+		delete       = { text = '' },
-    change = {
+		topdelete    = { text = '' },
-      text = " ┃",
+		changedelete = { text = '┃' },
-    },
+		untracked    = { text = ' ' },
-    delete = {
-      text = " ",
-    },
-    topdelete = {
-      text = " ",
-    },
-    changedelete = {
-      text = " ┃",
-    },
 	},
 	signcolumn = true,
 	numhl = false,
@@ -60,8 +42,6 @@ require("gitsigns").setup({
 		style = "minimal",
 		relative = "cursor",
 		row = 0,
-    col = 1,
+		vcol = 1,
 	},
-  yadm = { enable = false },
+}
-})
-

lua/config/plugins/hover_actions.lua

@@ -0,0 +1,17 @@
+require("hover").setup {
+	init = function()
+		require("hover.providers.lsp")
+		require("hover.providers.diagnostic")
+		require("hover.providers.dap")
+		require("hover.providers.dictionary")
+	end,
+	preview_opts = {
+		border = 'single'
+	},
+	preview_window = false,
+	title = true,
+	mouse_providers = {
+		'LSP'
+	},
+	mouse_delay = 1000
+}

lua/config/plugins/ibl.lua

@@ -0,0 +1,5 @@
+require("ibl").setup({
+	exclude = {
+		filetypes = { "dashboard" },
+	}
+})

lua/config/plugins/lsp_config.lua

@@ -0,0 +1,54 @@
+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 = {
+			hint = {
+				enable = true,
+			},
+		},
+	}
+})
+
+lspconfig.eslint.setup({
+	settings = {
+		codeActionOnSave = {
+			enable = true,
+			mode = "all",
+		},
+		format = true,
+	}
+})
+
+vim.lsp.enable('tailwindcss')
+
+lspconfig.tailwindcss.setup({})
+
+lspconfig.ts_ls.setup({
+	settings = {
+		typescript = {
+			inlayHints = {
+				includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
+				includeInlayFunctionParameterTypeHints = true,
+				includeInlayVariableTypeHints = true,
+				includeInlayPropertyDeclarationTypeHints = true,
+			},
+		},
+		javascript = {
+			inlayHints = {
+				includeInlayParameterNameHints = "all", -- 'none' | 'literals' | 'all'
+				includeInlayFunctionParameterTypeHints = true,
+				includeInlayVariableTypeHints = true,
+				includeInlayPropertyDeclarationTypeHints = true,
+			},
+		},
+	}
+})

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 = ''},
+		component_separators = { left = '', right = '' },
-    section_separators = { left = '', right = ''},
+		section_separators = { left = '', right = '' },
 		disabled_filetypes = {
 			statusline = {},
 			winbar = {},
@@ -29,11 +31,42 @@ require("lualine").setup({
 				cond = nil,
 			},
 		},
-    lualine_b = {'branch'},
+		lualine_b = { 'branch' },
-    lualine_c = {'diff'},
+		lualine_c = {
-    lualine_x = {'encoding', 'filetype', 'diagnostics', 'lsp'},
+			{
-    lualine_y = {'progress'},
+				'diff',
-    lualine_z = {'location'}
+				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_b = { 'branch' },
-    lualine_c = {'diff'},
+		lualine_c = {},
-    lualine_x = {'encoding', 'filetype', 'diagnostics', 'lsp'},
+		lualine_x = { 'encoding', 'filetype', 'diagnostics', 'lsp' },
-    lualine_y = {'progress'},
+		lualine_y = { 'progress' },
-    lualine_z = {'location'}
+		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

@@ -30,7 +30,7 @@ navic.setup {
 		TypeParameter = "󰊄 ",
 	},
 	lsp = {
-        auto_attach = false,
+		auto_attach = true,
 		preference = nil,
 	},
 	highlight = true,

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

@@ -1,19 +1,27 @@
 require("noice").setup({
 	lsp = {
-    -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
 		override = {
 			["vim.lsp.util.convert_input_to_markdown_lines"] = true,
 			["vim.lsp.util.stylize_markdown"] = true,
 			["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
 		},
 	},
-  -- you can enable a preset for easier configuration
 	presets = {
-    bottom_search = true, -- use a classic bottom cmdline for search
 		command_palette = true, -- position the cmdline and popupmenu together
 		long_message_to_split = true, -- long messages will be sent to a split
 		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,28 +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)
-
-require('ufo').setup({
-    open_fold_hl_timeout = 400,
-    close_fold_kinds = { "imports", "comment" },
-    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

@@ -0,0 +1,38 @@
+local navic = require("nvim-navic")
+
+vim.g.rustaceanvim = {
+	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,
+				},
+				checkOnSave = {
+					command = "clippy",
+					allFeatures = true
+				},
+				procMacro = {
+					enable = 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/config/plugins/winbar.lua

@@ -1,36 +0,0 @@
-require('winbar').setup({
-    enabled = true,
-
-    show_file_path = true,
-    show_symbols = true,
-
-    colors = {
-        path = '', -- You can customize colors like #c946fd
-        file_name = '',
-        symbols = '',
-    },
-
-    icons = {
-        file_icon_default = '',
-        seperator = ' ',
-        editor_state = '●',
-        lock_icon = '',
-    },
-
-    exclude_filetype = {
-        'help',
-        'startify',
-        'dashboard',
-        'packer',
-        'neo-tree',
-        'neogitstatus',
-        'NvimTree',
-        'Trouble',
-        'alpha',
-        'lir',
-        'Outline',
-        'spectre_panel',
-        'toggleterm',
-        'qf',
-    }
-})

lua/config/utils/bufferline.lua

@@ -0,0 +1,95 @@
+local Utils = {}
+
+function Utils.is_ft(b, ft)
+	return vim.bo[b].filetype == ft
+end
+
+function Utils.custom_filter(buf, buf_nums)
+	local logs = vim.tbl_filter(function(b)
+		return Utils.is_ft(b, "log")
+	end, buf_nums or {})
+	if vim.tbl_isempty(logs) then
+		return true
+	end
+	local tab_num = vim.fn.tabpagenr()
+	local last_tab = vim.fn.tabpagenr "$"
+	local is_log = Utils.is_ft(buf, "log")
+	if last_tab == 1 then
+		return true
+	end
+	-- only show log buffers in secondary tabs
+	return (tab_num == last_tab and is_log) or (tab_num ~= last_tab and not is_log)
+end
+
+function Utils.buf_kill(kill_command, bufnr, force)
+	local bo = vim.bo
+	local api = vim.api
+	local fmt = string.format
+	local fn = vim.fn
+
+	if bufnr == 0 or bufnr == nil then
+		bufnr = api.nvim_get_current_buf()
+	end
+
+	local bufname = api.nvim_buf_get_name(bufnr)
+
+	if not force then
+		local choice
+		if bo[bufnr].modified then
+			choice = fn.confirm(fmt([[Save changes to "%s"?]], bufname), "&Yes\n&No\n&Cancel")
+			if choice == 1 then
+				vim.api.nvim_buf_call(bufnr, function()
+					vim.cmd("w")
+				end)
+			elseif choice == 2 then
+				force = true
+			else
+				return
+			end
+		elseif api.nvim_get_option_value("buftype", { buf = 0 }) == "terminal" then
+			choice = fn.confirm(fmt([[Close "%s"?]], bufname), "&Yes\n&No\n&Cancel")
+			if choice == 1 then
+				force = true
+			else
+				return
+			end
+		end
+	end
+
+	-- Get list of windows IDs with the buffer to close
+	local windows = vim.tbl_filter(function(win)
+		return api.nvim_win_get_buf(win) == bufnr
+	end, api.nvim_list_wins())
+
+	if force then
+		kill_command = kill_command .. "!"
+	end
+
+	-- Get list of active buffers
+	local buffers = vim.tbl_filter(function(buf)
+		return api.nvim_buf_is_valid(buf) and bo[buf].buflisted
+	end, api.nvim_list_bufs())
+
+	-- If there is only one buffer (which has to be the current one), vim will
+	-- create a new buffer on :bd.
+	-- For more than one buffer, pick the previous buffer (wrapping around if necessary)
+	if #buffers > 1 and #windows > 0 then
+		for i, v in ipairs(buffers) do
+			if v == bufnr then
+				local prev_buf_idx = i == 1 and #buffers or (i - 1)
+				local prev_buffer = buffers[prev_buf_idx]
+				for _, win in ipairs(windows) do
+					api.nvim_win_set_buf(win, prev_buffer)
+				end
+			end
+		end
+	end
+
+	-- Check if buffer still exists, to ensure the target buffer wasn't killed
+	-- due to options like bufhidden=wipe.
+	if api.nvim_buf_is_valid(bufnr) and bo[bufnr].buflisted then
+		vim.cmd(string.format("%s %d", kill_command, bufnr))
+	end
+end
+
+return Utils

lua/mappings.lua

@@ -1,4 +1,7 @@
-local map = vim.keymap.set
+local map = vim.keymap.set;
+
+local bl_utils = require("config.utils.bufferline")
+local hover = require "hover"
 
 map("n", ";", ":", { desc = "CMD enter command mode" })
 
@@ -25,15 +28,16 @@ map("n", "<F5>", "<cmd>DapToggleBreakpoint<cr>")
 map("n", "mk", "<cmd>RustLsp moveItem upcr>")
 map("n", "m,", "<cmd>RustLsp moveItem down<cr>")
 map("n", "rs", "<cmd>RustLsp run<cr>")
-map("n", "hh", "<cmd>RustLsp hover actions<cr>")
 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", "<C-f>", "<C-q>")
-map("n", ">", "<cmd>>gv<cr>")
+map("i", "<C-f>", "<C-q>")
 
-map("n", "<leader>dr", "<cmd> DapContinue <cr>", { desc = "Continue debug" } )
+map("n", "<leader>c", function(bufnr)
+	bl_utils.buf_kill("bd", bufnr, true)
+end)
 
 map("n", "do", function()
 	require("dapui").open()
@@ -45,8 +49,27 @@ map("n", "dt", function()
 	require("dapui").toggle()
 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<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>nn", "<cmd>set norelativenumber<cr>")
 map("n", "<leader>rn", "<cmd>set relativenumber<cr>")
-map("n", "<leader>an", "<cmd>set norelativenumber<cr>")
 map("n", "tt", "<cmd>ToggleTerm<cr>")
 map("n", "<C-{>", "<cmd>foldopen<cr>")
 map("n", "<C-}>", "<cmd>foldclose<cr>")
+
+map("n", "hh", hover.hover)
+map("n", "hs", hover.hover_select)
+
+map("n", "vs", "<cmd> vsplit <cr>")
+map("n", "ss", "<cmd> split <cr>")

lua/plugins/core/init.lua

@@ -1,18 +1,27 @@
 return {
 	{
-    'nvim-lua/popup.nvim',
+		'simrat39/inlay-hints.nvim',
+	},
+	{
+		'nvim-telescope/telescope-ui-select.nvim'
+	},
+	{
+		"LunarVim/breadcrumbs.nvim",
 	},
 	{
 		"akinsho/bufferline.nvim",
 	},
+	{
+		"onsails/lspkind.nvim"
+	},
 	{
 		"lewis6991/gitsigns.nvim"
 	},
 	{
-    "nvim-lualine/lualine.nvim",
+		"lewis6991/hover.nvim",
 	},
 	{
-    "akinsho/toggleterm.nvim",
+		"nvim-lualine/lualine.nvim",
 	},
 	{
 		"windwp/nvim-autopairs",
@@ -20,18 +29,15 @@ return {
 	{
 		'kevinhwang91/promise-async',
 	},
+	{
+		"SmiteshP/nvim-navic",
+	},
 	{
 		'theHamsta/nvim-dap-virtual-text',
 	},
 	{
 		"hrsh7th/cmp-nvim-lsp",
 	},
-  {
-    "SmiteshP/nvim-navic",
-  },
-  {
-    'folke/noice.nvim',
-  },
 	{
 		"kyazdani42/nvim-web-devicons"
 	},
@@ -41,33 +47,41 @@ return {
 	{
 		'numToStr/Comment.nvim'
 	},
-  {
-    "L3MON4D3/LuaSnip",
-    lazy = true,
-  },
-  {
-    "folke/neodev.nvim", opts = {}
-  },
 	{
 		"nvim-treesitter/nvim-treesitter",
 	},
-  {
-    'fgheng/winbar.nvim'
-  },
-  {
-    "Bekaboo/dropbar.nvim",
-  },
 	{
 		"vague2k/huez.nvim",
 	},
+	{
+		"nvim-telescope/telescope.nvim",
+	},
+	{
+		"williamboman/mason-lspconfig.nvim",
+	},
 	{
 		"neovim/nvim-lspconfig",
-    dependencies = { "williamboman/mason-lspconfig.nvim", },
 	},
 	{
 		"mfussenegger/nvim-dap",
 		event = "VeryLazy",
 	},
+	{
+		"L3MON4D3/LuaSnip",
+		lazy = true,
+	},
+	{
+		'folke/lazydev.nvim',
+		ft = "lua",
+	},
+	{
+		"folke/noice.nvim",
+		event = "VeryLazy",
+		dependencies = {
+			-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+			"MunifTanjim/nui.nvim",
+		}
+	},
 	{
 		"nvim-neo-tree/neo-tree.nvim",
 		branch = "v2.x",
@@ -101,23 +115,23 @@ return {
 		end
 	},
 	{
-    "nvim-telescope/telescope.nvim",
+		'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",
@@ -125,51 +139,4 @@ return {
 			},
 		},
 	},
-  {
-    'kevinhwang91/nvim-ufo',
-    lazy = true,
-    config = function(_, opts)
-      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
-      opts["fold_virt_text_handler"] = handler
-      require("ufo").setup(opts)
-      vim.keymap.set("n", "K", function()
-        local winid = require("ufo").peekFoldedLinesUnderCursor()
-        if not winid then
-          -- vim.lsp.buf.hover()
-          vim.cmd [[ Lspsaga hover_doc ]]
-        end
-      end)
-    end,
-  },
 }

lua/plugins/secondary/init.lua

@@ -1,9 +1,11 @@
 return {
 	{
-    "goolord/alpha-nvim",
+		"catppuccin/nvim",
-    config = function ()
+		name = "catppuccin",
-        require'alpha'.setup(require'alpha.themes.dashboard'.config)
+		priority = 1000
-    end
+	},
+	{
+		"nvim-treesitter/playground"
 	},
 	{
 		"kaarmu/typst.vim",
@@ -14,7 +16,11 @@ return {
 		lazy = true,
 	},
 	{
-    "savq/melange-nvim"
+		'MunifTanjim/eslint.nvim',
+		lazy = true,
+	},
+	{
+		'akinsho/toggleterm.nvim', version = "*", config = true
 	},
 	{
 		"mlaursen/vim-react-snippets",
@@ -25,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",
@@ -43,8 +56,8 @@ return {
 		build = "npm install --legacy-peer-deps && npx gulp vsDebugServerBundle && mv dist out"
 	},
 	{
-    "mrcjkb/rustaceanvim",
+		'mrcjkb/rustaceanvim',
-    version = '^4', -- Recommended
+		version = '^6', -- Recommended
 		lazy = false, -- This plugin is already lazy
-  },
+	}
 }