Update 2025-05-31

Update 2025-05-03

Update 2025-05-05

Update 2025-05-07

Update 2025-05-09

chore: use mini.nvim

Update 2025-05-12

Update 2025-05-14

Update 2025-05-16

Update 2025-05-17

Update 2025-05-20

Update 2025-05-21

Update 2025-05-23

Update 2025-05-25

Update 2025-05-30

lua/plugins/autopairs.lua

@@ -1,23 +0,0 @@
-return {
-	"windwp/nvim-autopairs",
-	enabled = false,
-	event = "InsertEnter",
-	opts = {
-		disable_filetype = { "TelescopePrompt", "spectre_panel" },
-		disable_in_macro = true, -- disable when recording or executing a macro
-		disable_in_visualblock = false, -- disable when insert after visual block mode
-		disable_in_replace_mode = true,
-		ignored_next_char = [=[[%w%%%'%[%"%.%`%$]]=],
-		enable_moveright = true,
-		enable_afterquote = true, -- add bracket pairs after quote
-		enable_check_bracket_line = true, --- check bracket in same line
-		enable_bracket_in_quote = true,
-		enable_abbr = false, -- trigger abbreviation
-		break_undo = true, -- switch for basic rule break undo sequence
-		check_ts = false,
-		map_cr = true,
-		map_bs = true, -- map the <BS> key
-		map_c_h = false, -- Map the <C-h> key to delete a pair
-		map_c_w = true, -- map <c-w> to delete a pair if possible
-	},
-}

lua/plugins/ccc.lua

@@ -1,6 +1,6 @@
 return {
 	"uga-rosa/ccc.nvim",
-	config = function()
+	opts = function()
 		local ccc = require("ccc")
 		local ColorInput = require("ccc.input")
 		local convert = require("ccc.utils.convert")
@@ -61,72 +61,29 @@ return {
 			end
 		end
 
-		ccc.setup({
+		return {
 			pickers = {
 				ccc.picker.custom_entries({
-					bg = "#1a1b26",
-					bg_dark = "#16161e",
-					bg_float = "#16161e",
-					bg_highlight = "#292e42",
-					bg_popup = "#16161e",
-					bg_search = "#3d59a1",
-					bg_sidebar = "#16161e",
-					bg_statusline = "#16161e",
-					bg_visual = "#283457",
-					black = "#15161e",
-					blue = "#7aa2f7",
-					blue0 = "#3d59a1",
-					blue1 = "#2ac3de",
-					blue2 = "#0db9d7",
-					blue5 = "#89ddff",
-					blue6 = "#b4f9f8",
-					blue7 = "#394b70",
-					border = "#15161e",
-					border_highlight = "#27a1b9",
-					comment = "#565f89",
-					cyan = "#7dcfff",
-					dark3 = "#545c7e",
-					dark5 = "#737aa2",
-					delta_add = "#2c5a66",
-					delta_delete = "#713137",
-					diff_add = "#20303b",
-					diff_change = "#1f2231",
-					diff_delete = "#37222c",
-					diff_text = "#394b70",
-					error = "#db4b4b",
-					fg = "#c0caf5",
-					fg_dark = "#a9b1d6",
-					fg_float = "#c0caf5",
-					fg_gutter = "#3b4261",
-					fg_sidebar = "#a9b1d6",
-					git_add = "#449dab",
-					git_change = "#6183bb",
-					git_delete = "#914c54",
-					git_ignore = "#545c7e",
-					gitSigns_add = "#266d6a",
-					gitSigns_change = "#536c9e",
-					gitSigns_delete = "#b2555b",
-					green = "#9ece6a",
-					green1 = "#73daca",
-					green2 = "#41a6b5",
-					hint = "#1abc9c",
-					info = "#0db9d7",
-					magenta = "#bb9af7",
-					magenta2 = "#ff007c",
-					none = "NONE",
-					orange = "#ff9e64",
-					purple = "#9d7cd8",
-					red = "#f7768e",
-					red1 = "#db4b4b",
-					teal = "#1abc9c",
-					terminal_black = "#414868",
-					warning = "#e0af68",
-					yellow = "#e0af68",
+					base = "#191724",
+					surface = "#1f1d2e",
+					overlay = "#26233a",
+					muted = "#6e6a86",
+					subtle = "#908caa",
+					text = "#e0def4",
+					love = "#eb6f92",
+					gold = "#f6c177",
+					rose = "#ebbcba",
+					pine = "#31748f",
+					foam = "#9ccfd8",
+					iris = "#c4a7e7",
+					highlight_low = "#21202e",
+					highlight_med = "#403d52",
+					highlight_high = "#524f67",
 				}),
 			},
 			inputs = {
 				RgbHslInput,
 			},
-		})
+		}
 	end,
 }

lua/plugins/cellular-automaton.lua

@@ -5,7 +5,7 @@ return {
 		{
 			"<leader>mr",
 			"<cmd>CellularAutomaton make_it_rain<cr>",
-			desc = "[M]ake it [R]ain",
+			desc = "Make it Rain",
 		},
 	},
 }

lua/plugins/conform.lua

@@ -10,7 +10,7 @@ return {
 				require("conform").format({ async = true, lsp_fallback = "fallback" })
 			end,
 			mode = "",
-			desc = "[F]ormat buffer",
+			desc = "Format buffer",
 		},
 	},
 	opts = {

lua/plugins/crates.lua

@@ -8,7 +8,7 @@ return {
 			{
 				"<leader>ru",
 				require("crates").upgrade_all_crates,
-				desc = "[U]pgrade all crates",
+				desc = "Upgrade all crates",
 				ft = { "rust", "toml" },
 			},
 		},

lua/plugins/dap.lua

@@ -30,7 +30,7 @@ return {
 			function()
 				require("dap-python").test_method()
 			end,
-			desc = "Test [M]ethod",
+			desc = "Test Method",
 			ft = "python",
 		},
 		{
@@ -38,7 +38,7 @@ return {
 			function()
 				require("dap-python").test_class()
 			end,
-			desc = "Test [C]lass",
+			desc = "Test Class",
 			ft = "python",
 		},
 		{
@@ -46,7 +46,7 @@ return {
 			function()
 				require("dap-python").debug_selection()
 			end,
-			desc = "Debug [S]election",
+			desc = "Debug Selection",
 			ft = "python",
 		},
 		{
@@ -54,7 +54,7 @@ return {
 			function()
 				require("dapui").toggle()
 			end,
-			desc = "[T]oggle DAP-UI",
+			desc = "Toggle DAP-UI",
 		},
 		{
 			"<leader>dc",
@@ -68,49 +68,49 @@ return {
 			function()
 				require("dap").step_into()
 			end,
-			desc = "Step [I]nto Code",
+			desc = "Step Into Code",
 		},
 		{
 			"<leader>do",
 			function()
 				require("dap").step_over()
 			end,
-			desc = "Step [O]ver Code",
+			desc = "Step Over Code",
 		},
 		{
 			"<leader>dO",
 			function()
 				require("dap").step_out()
 			end,
-			desc = "Step [O]ut of Code",
+			desc = "Step Out of Code",
 		},
 		{
 			"<leader>dT",
 			function()
 				require("dap").terminate()
 			end,
-			desc = "[T]erminate",
+			desc = "Terminate",
 		},
 		{
 			"<leader>dl",
 			function()
 				require("dap").run_last()
 			end,
-			desc = "Run [L]ast",
+			desc = "Run Last",
 		},
 		{
 			"<leader>dh",
 			function()
 				require("dap.ui.widgets").hover()
 			end,
-			desc = "[H]over",
+			desc = "Hover",
 		},
 		{
 			"<leader>dP",
 			function()
 				require("dap.ui.widgets").preview()
 			end,
-			desc = "[P]review",
+			desc = "Preview",
 		},
 		{
 			"<leader>df",
@@ -118,7 +118,7 @@ return {
 				local widgets = require("dap.ui.widgets")
 				widgets.centered_float(widgets.frames)
 			end,
-			desc = "[F]rames",
+			desc = "Frames",
 		},
 		{
 			"<leader>ds",
@@ -126,7 +126,7 @@ return {
 				local widgets = require("dap.ui.widgets")
 				widgets.centered_float(widgets.scopes)
 			end,
-			desc = "[S]copes",
+			desc = "Scopes",
 		},
 		{
 			"<F1>",

lua/plugins/gh.lua

@@ -7,9 +7,9 @@ return {
 				require("litee.lib").setup()
 			end,
 		},
-		"folke/which-key.nvim",
+		-- "folke/which-key.nvim",
 	},
-	otps = {
+	opts = {
 		-- deprecated, around for compatability for now.
 		jump_mode = "invoking",
 		-- remap the arrow keys to resize any litee.nvim windows.

lua/plugins/gitignore.lua

@@ -8,7 +8,7 @@ return {
 			function()
 				require("gitignore").generate()
 			end,
-			desc = "[G]it [I]gnore",
+			desc = "Git Ignore",
 		},
 	},
 	config = function()

lua/plugins/gitsigns.lua

@@ -8,7 +8,7 @@ return {
 			function()
 				vim.cmd.Gitsigns("blame_line")
 			end,
-			desc = "[G]it [B]lame",
+			desc = "Git Blame",
 		},
 	},
 	opts = {

lua/plugins/hardtime.lua

@@ -0,0 +1,7 @@
+return {
+	"m4xshen/hardtime.nvim",
+	enabled = false,
+	lazy = false,
+	dependencies = { "MunifTanjim/nui.nvim" },
+	opts = {},
+}

lua/plugins/harpoon.lua

@@ -8,7 +8,7 @@ return {
 			function()
 				require("harpoon"):list():add()
 			end,
-			desc = "Harpoon [A]dd File",
+			desc = "Harpoon Add File",
 		},
 		{
 			"<C-e>",

lua/plugins/http-codes.lua

@@ -1,6 +1,6 @@
 return {
 	"barrett-ruth/http-codes.nvim",
 	dependencies = { "nvim-telescope/telescope.nvim" },
-	keys = { { "<leader>pdh", vim.cmd.HTTPCodes, desc = "[H]TTP" } },
+	keys = { { "<leader>pdh", vim.cmd.HTTPCodes, desc = "HTTP" } },
 	config = true,
 }

lua/plugins/ibl.lua

@@ -1,40 +0,0 @@
-return {
-	"lukas-reineke/indent-blankline.nvim",
-	enabled = false,
-	main = "ibl",
-	version = "*",
-	opts = {
-		indent = {
-			smart_indent_cap = true,
-		},
-		whitespace = {
-			remove_blankline_trail = true,
-		},
-		scope = {
-			show_start = true,
-			show_end = true,
-			show_exact_scope = true,
-		},
-		exclude = {
-			filetypes = {
-				"NvimTree",
-				"Trouble",
-				"alpha",
-				"dashboard",
-				"help",
-				"lazy",
-				"neogitstatus",
-				"packer",
-				"startify",
-				"lspinfo",
-				"dbee",
-			},
-			buftypes = {
-				"terminal",
-				"nofile",
-				"quickfix",
-				"prompt",
-			},
-		},
-	},
-}

lua/plugins/image.lua

@@ -1,3 +1,6 @@
+local function is_typst()
+	return vim.bo.filetype == "typst"
+end
 return {
 	"HakonHarnes/img-clip.nvim",
 	event = "VeryLazy",
@@ -7,11 +10,29 @@ return {
 	opts = {
 		default = {
 			dir_path = "assets/img",
-			extension = "webp",
-			process_cmd = "convert - -quality 75 webp:-",
-			file_name = "%Y-%m-%d-%H%M%S",
+			extension = function()
+				if is_typst() then
+					return "png"
+				else
+					return "webp"
+				end
+			end,
+			process_cmd = function()
+				if is_typst() then
+					return ""
+				else
+					return "convert - -quality 75 webp:-"
+				end
+			end,
+			file_name = "%Y-%m-%d_%H-%M-%S",
 			relative_to_current_file = false,
-			prompt_for_file_name = false,
+			prompt_for_file_name = function()
+				return is_typst()
+			end,
+			embed_image_as_base64 = false,
+			drag_and_drop = {
+				insert_mode = true,
+			},
 		},
 		filetypes = {
 			markdown = {
@@ -20,6 +41,14 @@ return {
 			vimwiki = {
 				template = "![[$FILE_PATH]]",
 			},
+			typst = {
+				template = [[
+#figure(
+  image("$FILE_PATH", width: 80%),
+  caption: [$CURSOR],
+) <$LABEL>
+    ]],
+			},
 		},
 	},
 }

lua/plugins/java.lua

@@ -1,3 +0,0 @@
-return {
-	"nvim-java/nvim-java",
-}

lua/plugins/just.lua

@@ -0,0 +1,4 @@
+return {
+	"NoahTheDuke/vim-just",
+	ft = { "just" },
+}

lua/plugins/lsp.lua

@@ -7,7 +7,6 @@ return {
 		"nvim-telescope/telescope.nvim",
 		"folke/trouble.nvim",
 		"folke/neoconf.nvim",
-		"piersolenski/telescope-import.nvim",
 		"mrcjkb/rustaceanvim",
 		"pmizio/typescript-tools.nvim",
 		"nvim-java/nvim-java",
@@ -28,11 +27,25 @@ return {
 		end
 
 		local default_setup = function(server)
+			local server_config = opts.servers[server]
 			local capabilities = require("blink.cmp").get_lsp_capabilities()
-			lspconfig[server].setup({
-				capabilities = extend_capabilities(capabilities),
-			})
+
+			local final_config = {}
+			if server_config then
+				-- Deep extend custom config with default capabilities
+				final_config = vim.tbl_deep_extend("force", {}, server_config, {
+					capabilities = extend_capabilities(capabilities),
+				})
+			else
+				-- Basic setup with default capabilities if no custom config exists
+				final_config = {
+					capabilities = extend_capabilities(capabilities),
+				}
+			end
+
+			lspconfig[server].setup(final_config)
 		end
+
 		vim.api.nvim_create_autocmd("LspAttach", {
 			desc = "LSP actions",
 			callback = function(event)
@@ -71,12 +84,12 @@ return {
 				nmap("<leader>lk", function()
 					vim.diagnostic.jump({ count = -1, float = true })
 				end, "Diagnostic Prev")
-				-- nmap("]d", function()
-				-- 	trouble.next({ mode = "diagnostics", skip_groups = true, jump = true })
-				-- end, "LSP: Trouble Next")
-				-- nmap("[d", function()
-				-- 	trouble.prev({ mode = "diagnostics", skip_groups = true, jump = true })
-				-- end, "Trouble Prev")
+				nmap("]d", function()
+					trouble:next({ mode = "diagnostics", skip_groups = true, jump = true })
+				end, "LSP: Trouble Next")
+				nmap("[d", function()
+					trouble.prev({ mode = "diagnostics", skip_groups = true, jump = true })
+				end, "Trouble Prev")
 				vim.keymap.set(
 					{ "n", "v" },
 					"<leader>la",
@@ -116,6 +129,7 @@ return {
 		require("mason-lspconfig").setup({
 			automatic_installation = true,
 			automatic_setup = true,
+			automatic_enable = true,
 			ensure_installed = {
 				"basedpyright",
 				"bashls",
@@ -139,12 +153,6 @@ return {
 			},
 		})
 
-		for server, config in pairs(opts.servers) do
-			local capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities)
-			config.capabilities = extend_capabilities(capabilities)
-			lspconfig[server].setup(config)
-		end
-
 		local function setup_ghostty_lsp()
 			-- Only activate ghostty-lsp when editing the ghostty config
 			if vim.fn.expand("%:p") == vim.fs.normalize("**/ghostty/config") then
@@ -321,25 +329,25 @@ return {
 					provideFormatter = false,
 				},
 			},
-			-- tinymist = {
-			-- 	offset_encoding = "utf-8",
-			-- 	settings = {
-			-- 		formatterMode = "typstyle",
-			-- 		exportPdf = "none",
-			-- 		outputPath = "$root/target/$dir/$name",
-			-- 		semanticTokens = "disable",
-			-- 	},
-			-- },
-			matlab_ls = {
-				indexWorkspace = true,
-				matlabConnectionTiming = "onStart",
-				telemetry = false,
-				filetypes = {
-					"matlab",
-					"octave",
+			tinymist = {
+				offset_encoding = "utf-8",
+				settings = {
+					formatterMode = "typstyle",
+					exportPdf = "none",
+					outputPath = "$root/target/$dir/$name",
+					semanticTokens = "disable",
+				},
+			},
+			-- jdtls = {},
+			markdown_oxide = {
+				capabilities = {
+					workspace = {
+						didChangeWatchedFiles = {
+							dynamicRegistration = true,
+						},
+					},
 				},
 			},
-			jdtls = {},
 		},
 	},
 }

lua/plugins/lualine.lua

@@ -1,30 +1,51 @@
+--- Adds `[]` around the string
+---@param str string
+---@param ctx table
+---@return string
+local function wrap_string(str, ctx)
+	return "[" .. str:gsub("%s+", "") .. "]"
+end
+
+local function diff_source()
+	local gitsigns = vim.b.gitsigns_status_dict
+	if gitsigns then
+		return {
+			added = gitsigns.added,
+			modified = gitsigns.changed,
+			removed = gitsigns.removed,
+		}
+	end
+end
+
 return {
 	"nvim-lualine/lualine.nvim",
+	event = "VimEnter",
 	dependencies = {
 		"nvim-tree/nvim-web-devicons",
-		"arkav/lualine-lsp-progress",
-		{ "letieu/harpoon-lualine", dependencies = {
-			"ThePrimeagen/harpoon",
-		} },
+		{
+			"linrongbin16/lsp-progress.nvim",
+			config = function()
+				require("lsp-progress").setup()
+			end,
+		},
+		"lewis6991/gitsigns.nvim",
+		{
+			"kristoferssolo/lualine-harpoon.nvim",
+			-- dir = "~/repos/lualine-harpoon.nvim/",
+			dependencies = {
+				{
+					"ThePrimeagen/harpoon",
+					branch = "harpoon2",
+				},
+			},
+		},
+		"folke/noice.nvim",
 	},
 	opts = {
 		options = {
-			icons_enabled = true,
-			theme = "auto",
 			component_separators = { left = "", right = "" },
 			section_separators = { left = "", right = "" },
-			disabled_filetypes = {
-				statusline = {},
-				winbar = {},
-			},
-			ignore_focus = {},
-			always_divide_middle = false,
-			globalstatus = true,
-			refresh = {
-				statusline = 1000,
-				tabline = 1000,
-				winbar = 1000,
-			},
+			color = { bg = "" },
 		},
 		--[[ Available components
 			`branch` (git branch)
@@ -45,24 +66,53 @@ return {
 			`tabs` (shows currently available tabs)
 			`windows` (shows currently available windows) ]]
 		sections = {
-			lualine_a = { "mode" },
-			lualine_b = { "branch" },
-			lualine_c = { "filename", "diff", "harpoon2", "lsp_progress" },
-			lualine_x = { "diagnostics", "encoding", "filetype", "filesize" },
-			lualine_y = { "progress" },
-			lualine_z = { "location" },
-		},
-		inactive_sections = {
 			lualine_a = {},
-			lualine_b = {},
-			lualine_c = { "filename" },
-			lualine_x = { "location" },
-			lualine_y = {},
+			lualine_b = {
+				{ "mode", fmt = wrap_string },
+				{ "b:gitsigns_head", icon = "" },
+			},
+			lualine_c = {
+				{
+					"filetype",
+					padding = { right = 0, left = 1 },
+					icon_only = true,
+				},
+				{
+					"filename",
+					padding = { right = 1, left = 0 },
+				},
+				{ "diff", source = diff_source },
+				"harpoon",
+			},
+			lualine_x = {
+				{
+					require("noice").api.statusline.mode.get,
+					cond = require("noice").api.statusline.mode.has,
+					color = { fg = "#f6c177" },
+				},
+				function()
+					return require("lsp-progress").progress()
+				end,
+				"diagnostics",
+			},
+			lualine_y = {
+				"filesize",
+				{
+					"location",
+					padding = 0,
+					fmt = function(str, _)
+						return "[" .. str:gsub("%s+", "") .. " "
+					end,
+				},
+				{
+					"progress",
+					padding = 0,
+					fmt = function(str, _)
+						return str:gsub("%s+", "") .. "]"
+					end,
+				},
+			},
 			lualine_z = {},
 		},
-		tabline = {},
-		winbar = {},
-		inactive_winbar = {},
-		extentions = {},
 	},
 }

lua/plugins/markdown.lua

@@ -1,28 +1,7 @@
 return {
-	-- {
-	-- 	"nfrid/markdown-togglecheck",
-	-- 	dependencies = { "nfrid/treesitter-utils" },
-	-- 	ft = { "markdown" },
-	-- 	keys = {
-	-- 		{
-	-- 			"<C-space>",
-	-- 			function()
-	-- 				require("markdown-togglecheck").toggle()
-	-- 			end,
-	-- 			desc = "Toggle Checkmark",
-	-- 			ft = "markdown",
-	-- 		},
-	-- 	},
-	-- 	opts = {
-	-- 		-- create empty checkbox on item without any while toggling
-	-- 		create = true,
-	-- 		-- remove checked checkbox instead of unckecking it while toggling
-	-- 		remove = false,
-	-- 	},
-	-- },
 	{
 		"tadmccorkle/markdown.nvim",
-		ft = { "markdown" },
+		ft = { "markdown", "Avante" },
 		opts = {
 			-- Disable all keymaps by setting mappings field to 'false'.
 			-- Selectively disable keymaps by setting corresponding field to 'false'.
@@ -88,6 +67,7 @@ return {
 	{
 		"OXY2DEV/markview.nvim",
 		-- enabled = false,
+		ft = { "markdown", "Avante" },
 		lazy = false,
 		opts = {
 			preview = {

lua/plugins/mini.lua

@@ -0,0 +1,17 @@
+return {
+	"echasnovski/mini.nvim",
+	version = "*",
+	opts = {
+		enabled = {
+			"ai",
+			-- "pairs",
+			"splitjoin",
+			"surround",
+		},
+	},
+	config = function(_, opts)
+		for _, value in ipairs(opts.enabled) do
+			require("mini." .. value).setup()
+		end
+	end,
+}

lua/plugins/neogit.lua

@@ -13,9 +13,9 @@ return {
 			function()
 				require("neogit").open({ kind = "split" })
 			end,
-			desc = "[G]it",
+			desc = "Git",
 		},
-		{ "<leader>gd", vim.cmd.DiffviewOpen, desc = "[G]it [D]iff" },
+		{ "<leader>gd", vim.cmd.DiffviewOpen, desc = "Git Diff" },
 	},
 	opts = {
 		-- Hides the hints at the top of the status buffer

lua/plugins/neorg.lua

@@ -7,17 +7,42 @@ return {
 	},
 	cmd = { "Neorg" },
 	keys = {
-		{ "<C-Space>", "<Plug>(neorg.qol.todo-items.todo.task-cycle)", desc = "Cycle Todo Item", ft = { "norg" } },
+		{
+			"<C-Space>",
+			"<Plug>(neorg.qol.todo-items.todo.task-cycle)",
+			desc = "Cycle Todo Item",
+			ft = { "norg" },
+		},
 		{
 			"<LocalLeader>cm",
 			"<Plug>(neorg.looking-glass.magnify-code-block)",
 			desc = "Mignify Code Block",
 			ft = { "norg" },
 		},
-		{ "<LocalLeader>id", "<Plug>(neorg.tempus.insert-date)", desc = "Insert Date", ft = { "norg" } },
-		{ "<LocalLeader>li", "<Plug>(neorg.pivot.list.invert)", desc = "List invert", ft = { "norg" } },
-		{ "<LocalLeader>lt", "<Plug>(neorg.pivot.list.toggle)", desc = "List Toggle", ft = { "norg" } },
-		{ "<LocalLeader>nn", "<Plug>(neorg.dirman.new-note)", desc = "New Note", ft = { "norg" } },
+		{
+			"<LocalLeader>id",
+			"<Plug>(neorg.tempus.insert-date)",
+			desc = "Insert Date",
+			ft = { "norg" },
+		},
+		{
+			"<LocalLeader>li",
+			"<Plug>(neorg.pivot.list.invert)",
+			desc = "List invert",
+			ft = { "norg" },
+		},
+		{
+			"<LocalLeader>lt",
+			"<Plug>(neorg.pivot.list.toggle)",
+			desc = "List Toggle",
+			ft = { "norg" },
+		},
+		{
+			"<LocalLeader>nn",
+			"<Plug>(neorg.dirman.new-note)",
+			desc = "New Note",
+			ft = { "norg" },
+		},
 		{
 			"<LocalLeader>ta",
 			"<Plug>(neorg.qol.todo-items.todo.task-ambiguous)",

lua/plugins/neotest.lua

@@ -17,14 +17,14 @@ return {
 			function()
 				require("neotest").watch.toggle(vim.fn.expand("%"))
 			end,
-			desc = "Toggle Neo[T]est",
+			desc = "Toggle NeoTest",
 		},
 		{
 			"<leader>ts",
 			function()
 				require("neotest").summary.toggle()
 			end,
-			desc = "Toggle [S]ummary",
+			desc = "Toggle Summary",
 		},
 		{
 			"<leader>tj",

lua/plugins/noice.lua

@@ -0,0 +1,45 @@
+return {
+	"folke/noice.nvim",
+	event = "VeryLazy",
+	dependencies = {
+		"MunifTanjim/nui.nvim",
+	},
+	keys = {
+		{
+			"<S-Enter>",
+			function()
+				require("noice").redirect(vim.fn.getcmdline())
+			end,
+			mode = "c",
+			desc = "Redirect Cmdline",
+		},
+	},
+	opts = {
+		cmdline = {
+			view = "cmdline",
+		},
+		routes = {
+			{
+				view = "notify",
+				filter = { event = "msg_showmode" },
+			},
+		},
+		lsp = {
+			progress = {
+				enabled = false,
+			},
+			override = {
+				["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+				["vim.lsp.util.stylize_markdown"] = true,
+				["cmp.entry.get_documentation"] = true,
+			},
+		},
+		presets = {
+			bottom_search = true, -- use a classic bottom cmdline for search
+			command_palette = false, -- 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 = true, -- add a border to hover docs and signature help
+		},
+	},
+}

lua/plugins/otter.lua

@@ -3,6 +3,5 @@ return {
 	dependencies = {
 		"nvim-treesitter/nvim-treesitter",
 	},
-	enabled = false,
 	opts = {},
 }

lua/plugins/snacks.lua

@@ -1,5 +1,9 @@
 return {
 	"folke/snacks.nvim",
+	dependencies = {
+		"echasnovski/mini.icons",
+		"stevearc/oil.nvim",
+	},
 	priority = 1000,
 	lazy = false,
 	opts = function()
@@ -12,11 +16,11 @@ return {
 			bigfile = { enabled = true },
 			bufdelete = { enabled = true },
 			dashboard = { enabled = false },
-			debug = { enabled = false },
+			debug = { enabled = true },
 			dim = { enabled = true },
 			explorer = { enabled = false },
 			git = { enabled = false },
-			gitbrowse = { enabled = false },
+			gitbrowse = { enabled = true },
 			image = {
 				enabled = true,
 				doc = {
@@ -41,29 +45,19 @@ return {
 			scope = { enabled = false },
 			scratch = { enabled = false },
 			scroll = { enabled = false },
-			statuscolumn = { enabled = false },
+			statuscolumn = {
+				enabled = true,
+				left = { "mark", "sign", "git" },
+				right = { "fold" },
+			},
 			terminal = { enabled = false },
-			toggle = { enabled = false },
+			toggle = { enabled = true },
 			win = { enabled = false },
 			words = { enabled = true },
-			zen = { enabled = true },
+			zen = { enabled = false },
 		}
 	end,
 	keys = {
-		{
-			"<leader>zz",
-			function()
-				Snacks.zen()
-			end,
-			desc = "Toggle Zen Mode",
-		},
-		{
-			"<leader>zZ",
-			function()
-				Snacks.zen.zoom()
-			end,
-			desc = "Toggle Zoom",
-		},
 		{
 			"<leader>Nn",
 			function()
@@ -78,6 +72,13 @@ return {
 			end,
 			desc = "Profiler Scratch Bufer",
 		},
+		{
+			"<leader>gB",
+			function()
+				Snacks.gitbrowse()
+			end,
+			desc = "Git Browse",
+		},
 	},
 	init = function()
 		vim.api.nvim_create_autocmd("User", {

lua/plugins/spellwarn.lua

@@ -9,7 +9,7 @@ return {
 			function()
 				vim.cmd.Spellwarn("toggle")
 			end,
-			desc = "[S]pellwarn toggle",
+			desc = "Spellwarn toggle",
 		},
 	},
 

lua/plugins/surround.lua

@@ -1,6 +0,0 @@
-return {
-	"kylechui/nvim-surround",
-	version = "*", -- Use for stability; omit to use `main` branch for the latest features
-	event = "VeryLazy",
-	opts = {},
-}

lua/plugins/tagbar.lua

@@ -1,6 +1,6 @@
 return {
 	"preservim/tagbar",
 	keys = {
-		{ "<leader>b", vim.cmd.TagbarToggle, desc = "Toggle Tag[b]ar" },
+		{ "<leader>b", vim.cmd.TagbarToggle, desc = "Toggle Tagbar" },
 	},
 }

lua/plugins/telescope.lua

@@ -3,19 +3,19 @@ return {
 	version = "*",
 	dependencies = {
 		"nvim-lua/plenary.nvim",
-		{ "nvim-tree/nvim-web-devicons" },
+		"nvim-tree/nvim-web-devicons",
 		{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
-		{ "nvim-telescope/telescope-media-files.nvim" },
-		{ "nvim-telescope/telescope-symbols.nvim" },
-		{ "nvim-telescope/telescope-bibtex.nvim" },
-		{ "tsakirist/telescope-lazy.nvim" },
-		{ "chip/telescope-software-licenses.nvim" },
-		{ "crispgm/telescope-heading.nvim" },
-		{ "benfowler/telescope-luasnip.nvim" },
-		{ "paopaol/telescope-git-diffs.nvim" },
+		"nvim-telescope/telescope-media-files.nvim",
+		"nvim-telescope/telescope-symbols.nvim",
+		"nvim-telescope/telescope-bibtex.nvim",
+		"tsakirist/telescope-lazy.nvim",
+		"chip/telescope-software-licenses.nvim",
+		"crispgm/telescope-heading.nvim",
+		"benfowler/telescope-luasnip.nvim",
+		"paopaol/telescope-git-diffs.nvim",
 		{ "ThePrimeagen/harpoon", branch = "harpoon2" },
-		{ "piersolenski/telescope-import.nvim" },
-		{ "nvim-telescope/telescope-frecency.nvim" },
+		"nvim-telescope/telescope-frecency.nvim",
+		"nvim-telescope/telescope-ui-select.nvim",
 	},
 	keys = {
 		{
@@ -26,7 +26,7 @@ return {
 		{
 			"<leader>pf",
 			require("telescope.builtin").find_files,
-			desc = "[F]iles",
+			desc = "Files",
 		},
 		{
 			"<leader>/",
@@ -38,70 +38,70 @@ return {
 			desc = "Current Buffer Fuzzy",
 		},
 		{ "<leader>ps", require("telescope.builtin").live_grep, desc = "Live Grep" },
-		{ "<leader>pb", require("telescope.builtin").buffers, desc = "Find [B]uffers" },
-		{ "<leader>pws", require("telescope.builtin").grep_string, desc = "[S]tring under the cursor" },
-		{ "<leader>pe", require("telescope.builtin").symbols, desc = "[E]moji" },
-		{ "<leader>pd", require("telescope.builtin").diagnostic, desc = "[D]iagnostics" },
-		{ "<leader>pB", require("telescope.builtin").git_branches, desc = "Checkout [B]ranch" },
-		{ "<leader>ph", require("telescope.builtin").help_tags, desc = "[H]elp" },
-		{ "<leader>pM", require("telescope.builtin").man_pages, desc = "[M]an Pages" },
-		{ "<leader>pr", require("telescope.builtin").oldfiles, desc = "Open [R]ecent Files" },
-		{ "<leader>pR", require("telescope.builtin").registers, desc = "[R]egisters" },
-		{ "<leader>pg", require("telescope.builtin").git_files, desc = "[G]it Files" },
-		{ "<leader>pk", require("telescope.builtin").keymaps, desc = "[K]eymaps" },
-		{ "<leader>pC", require("telescope.builtin").commands, desc = "[C]ommands" },
-		{ "<leader>pt", vim.cmd.TodoTelescope, desc = "[T]odo" },
+		{ "<leader>pb", require("telescope.builtin").buffers, desc = "Find Buffers" },
+		{ "<leader>pws", require("telescope.builtin").grep_string, desc = "String under the cursor" },
+		{ "<leader>pe", require("telescope.builtin").symbols, desc = "Emoji" },
+		{ "<leader>pd", require("telescope.builtin").diagnostic, desc = "Diagnostics" },
+		{ "<leader>pB", require("telescope.builtin").git_branches, desc = "Checkout Branch" },
+		{ "<leader>ph", require("telescope.builtin").help_tags, desc = "Help" },
+		{ "<leader>pM", require("telescope.builtin").man_pages, desc = "Man Pages" },
+		{ "<leader>pr", require("telescope.builtin").oldfiles, desc = "Open Recent Files" },
+		{ "<leader>pR", require("telescope.builtin").registers, desc = "Registers" },
+		{ "<leader>pg", require("telescope.builtin").git_files, desc = "Git Files" },
+		{ "<leader>pk", require("telescope.builtin").keymaps, desc = "Keymaps" },
+		{ "<leader>pC", require("telescope.builtin").commands, desc = "Commands" },
+		{ "<leader>pt", vim.cmd.TodoTelescope, desc = "Todo" },
 		{
 			"<leader>pm",
 			function()
 				require("telescope").extensions.media_files.media_files()
 			end,
-			desc = "[M]edia",
+			desc = "Media",
 		},
 		{
 			"<leader>pc",
 			function()
 				require("telescope.builtin").colorscheme({ enable_preview = true })
 			end,
-			desc = "[C]olorscheme with Preview",
+			desc = "Colorscheme with Preview",
 		},
 		{
 			"<leader>pl",
 			function()
 				require("telescope").extensions.lazy.lazy()
 			end,
-			desc = "[L]azy",
+			desc = "Lazy",
 		},
 		{
 			"<leader>pL",
 			function()
 				require("telescope").extensions.luasnip.luasnip()
 			end,
-			desc = "[L]uasnip",
+			desc = "Luasnip",
 		},
 		{
 			"<leader>pH",
 			function()
 				require("telescope").extensions.heading.heading()
 			end,
-			desc = "[H]eading",
+			desc = "Heading",
 		},
 		{
 			"<leader>pds",
 			"<cmd>Telescope software-licenses find<cr>",
-			desc = "[S]oftware Licenses",
+			desc = "Software Licenses",
 		},
 		{
 			"<leader>pD",
 			function()
 				require("telescope").extensions.git_diffs.diff_commits()
 			end,
-			desc = "[G]it [D]iff Telescope",
+			desc = "Git Diff Telescope",
 		},
 		{
 			"<leader>tB",
 			require("telescope.builtin").bibtex,
-			desc = "Telescope [B]ibtex",
+			desc = "Telescope Bibtex",
 		},
 	},
 	opts = {
@@ -251,17 +251,6 @@ return {
 				hide_current_buffer = true,
 				show_scores = true,
 			},
-			import = {
-				insert_at_top = true,
-				custom_languages = {
-					-- {
-					-- 	extensions = { "js", "ts" },
-					-- 	filetypes = { "vue" },
-					-- 	insert_at_line = 2,
-					-- 	regex = [[^(?:import(?:[\"'\s]*([\w*{}\n, ]+)from\s*)?[\"'\s](.*?)[\"'\s].*)]],
-					-- },
-				},
-			},
 			package_info = {
 				-- Optional theme (the extension doesn't set a default theme)
 				theme = "ivy",
@@ -274,6 +263,7 @@ return {
 		telescope.setup(opts)
 
 		pcall(telescope.load_extension, "fzf")
+		pcall(telescope.load_extension, "ui-select")
 		pcall(telescope.load_extension, "media_files") -- Telescope media_files
 		pcall(telescope.load_extension, "lazy") -- Telescope lazy
 		pcall(telescope.load_extension, "software-licenses") -- Telescope software-licenses list

lua/plugins/todo-comments.lua

@@ -16,7 +16,7 @@ return {
 			HACK = { icon = " ", color = "warning" },
 			WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX" } },
 			PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
-			NOTE = { icon = " ", color = "hint", alt = { "INFO" } },
+			NOTE = { icon = " ", color = "hint", alt = { "INFO", "HINT" } },
 			TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
 		},
 		gui_style = {

lua/plugins/treesitter.lua

@@ -35,6 +35,7 @@ return {
 
 		highlight = {
 			enable = true,
+			disable = { "just" },
 			-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
 			-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
 			-- Using this option may slow down your editor, and you may see some duplicate highlights.

lua/plugins/trouble.lua

@@ -13,7 +13,7 @@ return {
 		{
 			"<leader>xd",
 			"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
-			desc = "[D]ocument Diagnostics",
+			desc = "Document Diagnostics",
 		},
 	},
 	opts = {},

lua/plugins/undotree.lua

@@ -1,6 +1,6 @@
 return {
 	"mbbill/undotree",
 	keys = {
-		{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Toggle [U]ndotree" },
+		{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Toggle Undotree" },
 	},
 }

lua/plugins/vimtex.lua

@@ -3,12 +3,12 @@ return {
 	enabled = false,
 	ft = "tex",
 	keys = {
-		{ "<leader>Tb", vim.cmd.VimtexCompile, desc = "[B]uild", ft = "tex" },
-		{ "<leader>Tv", vim.cmd.VimtexView, desc = "[V]iew", ft = "tex" },
-		{ "<leader>Tw", vim.cmd.VimtexCountWords, desc = "[W]ord Count", ft = "tex" },
-		{ "<leader>Tt", vim.cmd.VimtexTocToggle, desc = "[T]able of Contents", ft = "tex" },
-		{ "<leader>Tc", vim.cmd.VimtexClean, desc = "[C]lean aux", ft = "tex" },
-		{ "<leader>Te", vim.cmd.VimtexErrors, desc = "Report [E]rrors", ft = "tex" },
-		{ "<leader>Ti", vim.cmd.VimtexInfo, desc = "[I]nfo", ft = "tex" },
+		{ "<leader>Tb", vim.cmd.VimtexCompile, desc = "Build", ft = "tex" },
+		{ "<leader>Tv", vim.cmd.VimtexView, desc = "View", ft = "tex" },
+		{ "<leader>Tw", vim.cmd.VimtexCountWords, desc = "Word Count", ft = "tex" },
+		{ "<leader>Tt", vim.cmd.VimtexTocToggle, desc = "Table of Contents", ft = "tex" },
+		{ "<leader>Tc", vim.cmd.VimtexClean, desc = "Clean aux", ft = "tex" },
+		{ "<leader>Te", vim.cmd.VimtexErrors, desc = "Report Errors", ft = "tex" },
+		{ "<leader>Ti", vim.cmd.VimtexInfo, desc = "Info", ft = "tex" },
 	},
 }

lua/plugins/which-key.lua

@@ -4,13 +4,20 @@ return {
 	dependencies = {
 		"echasnovski/mini.icons",
 	},
-	version = "*",
+	version = "v3",
+	keys = {
+		{
+			"<leader>?",
+			function()
+				require("which-key").show({ global = false })
+			end,
+			desc = "Buffer Local Keymaps (which-key)",
+		},
+	},
 	opts = {
 		preset = "modern",
 		sort = { "alphanum", "local", "order", "group", "mod", "lower", "icase" },
-		icons = {
-			rules = false,
-		},
+		icons = {},
 		defaults = {},
 		disable = {
 			ft = {},
@@ -21,44 +28,44 @@ return {
 				mode = "v",
 				"<leader>s",
 				":s///gI<Left><Left><Left><Left>",
-				desc = "[s]ubstitute word",
+				desc = "substitute word",
 			},
 			{
-				{ "<leader>c", vim.cmd.bdelete, desc = "[C]lose Buffer" },
+				{ "<leader>c", vim.cmd.bdelete, desc = "Close Buffer" },
 				{
 					"<leader>X",
 					function()
 						vim.cmd("!chmod +x %")
 					end,
-					desc = "Make E[x]ecutable",
+					desc = "Make Executable",
 				},
 				{ "<leader>x", group = "Trouble" },
-				{ "<leader>g", group = "[G]it" },
+				{ "<leader>g", group = "Git" },
 				{ "<leader>q", group = "Persistence" },
-				{ "<leader>l", group = "[L]SP" },
-				{ "<leader>w", group = "[W]orkspace" },
-				{ "<leader>p", group = "Telescope", { "<leader>pd", group = "[D]evelopment" } },
-				{ "<leader>z", group = "[Z]en" },
+				{ "<leader>l", group = "LSP" },
+				{ "<leader>w", group = "Workspace" },
+				{ "<leader>p", group = "Telescope", { "<leader>pd", group = "Development" } },
+				{ "<leader>z", group = "Zen" },
 				{ "<leader>o", group = "Action" },
-				{ "<leader>r", group = "[R]ust" },
+				{ "<leader>r", group = "Rust" },
 				{ "<leader>n", group = "Gitpat" },
-				{ "<leader>m", group = "[M]isc" },
-				{ "<leader>T", group = "Vim[T]ex" },
-				{ "<leader>N", group = "[N]otifications" },
-				{ "<leader>O", group = "[O]bsidian" },
+				{ "<leader>m", group = "Misc" },
+				{ "<leader>T", group = "VimTex" },
+				{ "<leader>N", group = "Notifications" },
+				{ "<leader>O", group = "Obsidian" },
 				{ "<leader>s", group = "Neogen" },
-				{ "<leader>t", group = "Neo[t]est" },
+				{ "<leader>t", group = "Neotest" },
 				{
 					"<leader>d",
-					group = "[D]AP",
+					group = "DAP",
 					{
 						"<leader>dp",
-						group = "[P]ython",
+						group = "Python",
 					},
 				},
 				{
 					"<leader>L",
-					group = "[L]anguate settings",
+					group = "Languate settings",
 					{ "<leader>Lc", "<cmd>setlocal formatoptions-=cro<cr>", desc = "Disable autocomment" },
 					{ "<leader>LC", "<cmd>setlocal formatoptions=cro<cr>", desc = "Enable autocomment" },
 					{ "<leader>Ls", "<cmd>setlocal spell!<cr>", desc = "Toggle spellchecker" },
@@ -73,7 +80,7 @@ return {
 					{
 						{
 							"<leader>Pl",
-							group = "[L]atex",
+							group = "Latex",
 							cond = function()
 								return vim.bo.filetype == "lua"
 							end,

lua/plugins/zen-mode.lua

@@ -1,63 +0,0 @@
-return {
-	"folke/zen-mode.nvim",
-	dependencies = { "lukas-reineke/indent-blankline.nvim" },
-	enabled = false,
-	keys = {
-		{
-			"<leader>zz",
-			function()
-				require("zen-mode").toggle()
-			end,
-			desc = "Toggle [Z]en Mode",
-		},
-	},
-	opts = {
-		window = {
-			backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
-			-- height and width can be:
-			-- * an absolute number of cells when > 1
-			-- * a percentage of the width / height of the editor when <= 1
-			-- * a function that returns the width or the height
-			width = 120, -- width of the Zen window
-			height = 1, -- height of the Zen window
-			-- by default, no options are changed for the Zen window
-			-- uncomment any of the options below, or add other vim.wo options you want to apply
-			options = {
-				signcolumn = "no", -- disable signcolumn
-				number = false, -- disable number column
-				relativenumber = false, -- disable relative numbers
-				cursorline = false, -- disable cursorline
-				cursorcolumn = false, -- disable cursor column
-				foldcolumn = "0", -- disable fold column
-				colorcolumn = "0", -- disable colorcolumn
-				list = false, -- disable whitespace characters
-				wrap = false, -- disable word wrap
-			},
-		},
-		plugins = {
-			-- disable some global vim options (vim.o...)
-			-- comment the lines to not apply the options
-			options = {
-				enabled = true,
-				ruler = false, -- disables the ruler text in the cmd line area
-				showcmd = false, -- disables the command in the last line of the screen
-				-- you may turn on/off statusline in zen mode by setting 'laststatus'
-				-- statusline will be shown only if 'laststatus' == 3
-				laststatus = 0, -- turn off the statusline in zen mode
-			},
-			twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
-			gitsigns = { enabled = true }, -- disables git signs
-			tmux = { enabled = true }, -- disables the tmux statusline
-			alacritty = {
-				enabled = false,
-				font = "14", -- font size
-			},
-		},
-		-- callback where you can add custom code when the Zen window opens
-		on_open = function(win)
-			require("ibl").setup({ enabled = false })
-		end,
-		-- callback where you can add custom code when the Zen window closes
-		on_close = function() end,
-	},
-}