chore(nvim,deps): update plugins

13 files changed, 188 insertions, 223 deletions

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 21e1091..7873de7 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,72 +1,72 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "d9cfae1059b62f7eacc09dba181efe4894e3b086" },
-  "LuaSnip": { "branch": "master", "commit": "5570fd797eae0790affb54ea669a150cad76db5d" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "99cdee23ff1343da67c37b4dffb0821a8fdf82a6" },
+  "LuaSnip": { "branch": "master", "commit": "5d57303efde86fcb0959c52b1a6d40f923940f34" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "c55c35929dd4e670af7ab6e2e197a4687baa2076" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
   "cmp-commit": { "branch": "main", "commit": "5f7d19957012ba114da59f06c7e6a3adafb1751d" },
   "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
   "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" },
-  "cmp-git": { "branch": "main", "commit": "fae6cdb407ad6c63a0b1928670bad1a67a55b887" },
+  "cmp-git": { "branch": "main", "commit": "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261" },
   "cmp-npm": { "branch": "main", "commit": "4b6166c3feeaf8dae162e33ee319dc5880e44a29" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" },
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "069a207be6a0327dcc62c957dbb38156b210733a" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "d2768cb1b83de649d57d967085fe73c5e01f8fd7" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "d276254e7198ab7d00f117e88e223b4bd8c02d21" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f3491638d123cfd2c8048aefaf66d246ff250ca6" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "diffview.nvim": { "branch": "main", "commit": "18f83302f71889b39403919b8be00d7244d1fcfc" },
+  "diffview.nvim": { "branch": "main", "commit": "18d88c86a1d7b5256f96694bd41aaee7037a6cc1" },
   "dressing.nvim": { "branch": "master", "commit": "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c" },
   "git-conflict.nvim": { "branch": "main", "commit": "cbefa7075b67903ca27f6eefdc9c1bf0c4881017" },
   "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" },
-  "gruvbox.nvim": { "branch": "main", "commit": "c64ec557672c9c8ecc71a438533525482021377f" },
+  "gruvbox.nvim": { "branch": "main", "commit": "e863942494d7c72a7c8d2c54cf651f28fc5a76ab" },
   "harpoon": { "branch": "master", "commit": "21d0d1bfa3000e4384740bfaefa0ebc51c773786" },
   "indent-blankline.nvim": { "branch": "master", "commit": "db7cbcb40cc00fc5d6074d7569fb37197705e7f6" },
-  "lazy.nvim": { "branch": "main", "commit": "c1a50a7fc5900a3f89f1c5754bb48310ae619e35" },
+  "lazy.nvim": { "branch": "main", "commit": "ef87c24e8ede2a94cbeaea1667eaeb7f8ed40dc0" },
   "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
-  "lualine.nvim": { "branch": "master", "commit": "32a7382a75a52e8ad05f4cec7eeb8bbfbe80d461" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "aa25b4153d2f2636c3b3a8c8360349d2b29e7ae3" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "1fcf055cf3e76e2c228400b504f63fee590863f2" },
+  "lualine.nvim": { "branch": "master", "commit": "d8c392dd75778d6258da4e7c55522e94ac389732" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "3751eb5c56c67b51e68a1f4a0da28ae74ab771c1" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "c4b4a6fe3cb8d8590b831c22b3475166dc9a894e" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "d6cb770928b5cb9a6e3880d6bbb58858c1deeb18" },
   "mason-update-all": { "branch": "main", "commit": "7cd70d89588ebcdec3d05a1ce820a9c8c5b667b6" },
-  "mason.nvim": { "branch": "main", "commit": "b8c3fceed16d29a166cf73ce55358f13c9f6cfcc" },
-  "neodev.nvim": { "branch": "main", "commit": "c045c0fe93b1f9c78443d0f3b88660fffbcf64a7" },
-  "neogit": { "branch": "master", "commit": "0d6002c6af432343937283fb70791fc76fa7227c" },
+  "mason.nvim": { "branch": "main", "commit": "a4ebe1f14ba31242cd09f9e0709d5b1f9d2bcecb" },
+  "neodev.nvim": { "branch": "main", "commit": "258b83f48405c6b530c09dd96950693664dc6bc0" },
+  "neogit": { "branch": "master", "commit": "a364c3da583a78f707aac761f5927967a0165143" },
   "noice.nvim": { "branch": "main", "commit": "256ec7318e227d4a0879f3776bfbe3955f5d2eef" },
-  "nui.nvim": { "branch": "main", "commit": "4939282919885e1c83aff68ecb35b3cadf6015a9" },
-  "null-ls.nvim": { "branch": "main", "commit": "d09d7d82cc26d63673cef85cb62895dd68aab6d8" },
-  "nvim-bqf": { "branch": "main", "commit": "b418b0a241d36509196944a6f6bee886c775d54f" },
-  "nvim-cmp": { "branch": "main", "commit": "c49ad26e894e137e401b1d294948c46327877eaf" },
+  "nui.nvim": { "branch": "main", "commit": "257da38029d3859ed111804f9d4e95b0fa993a31" },
+  "null-ls.nvim": { "branch": "main", "commit": "915558963709ea17c5aa246ca1c9786bfee6ddb4" },
+  "nvim-bqf": { "branch": "main", "commit": "c059d724434f2e320fd59c398084e33dd2e6706b" },
+  "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "69b7c684cd42e60b48875c580e616a70bccfdbe7" },
-  "nvim-dap-go": { "branch": "main", "commit": "8f10f347b3332d1f783a209813bf9b61f517256f" },
+  "nvim-dap": { "branch": "master", "commit": "700a3c7d6fbe5b07bee74e9952b456120d355c47" },
+  "nvim-dap-go": { "branch": "main", "commit": "6f045a72a05a78e4071dd0880f08214a2bb1461b" },
   "nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "2971ce3e89b1711cc26e27f73d3f854b559a77d4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6b43ce561d97412cc512b569db6938e44529293e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7b98aadc6e85db4fc3af6c1ec22c4774d965506e" },
   "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" },
   "nvim-notify": { "branch": "master", "commit": "b005821516f1f37801a73067afd1cef2dbc4dfe8" },
-  "nvim-treesitter": { "branch": "master", "commit": "12e95e160d7d45b76a36bca6303dd8447ab77490" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "d28654b012d4c56beafec630ef7143275dff76f8" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "d816761ec1ea4a605689bc5f4111088459cf74d4" },
+  "nvim-treesitter": { "branch": "master", "commit": "5fb315df12a3091f241b0326aed0ec70381adbd8" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "cacee4828152dd3a83736169ae61bbcd29a3d213" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "a8c86f48c1030acee22b9e071e3c531de77bf253" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" },
-  "nvim-ts-hint-textobject": { "branch": "master", "commit": "ad03c877903835a2ca9635accab47bff8be21b18" },
-  "nvim-web-devicons": { "branch": "master", "commit": "05e1072f63f6c194ac6e867b567e6b437d3d4622" },
+  "nvim-ts-hint-textobject": { "branch": "master", "commit": "54d6646809d82da0c5d864fb3126ab1961a11f48" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
   "playground": { "branch": "master", "commit": "8a887bcf66017bd775a0fb19c9d8b7a4d6759c48" },
-  "plenary.nvim": { "branch": "master", "commit": "4b7e52044bbb84242158d977a50c4cbcd85070c7" },
+  "plenary.nvim": { "branch": "master", "commit": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd" },
   "presence.nvim": { "branch": "main", "commit": "c1c54758824cbecd4e18065d37191f7666fdd097" },
-  "refactoring.nvim": { "branch": "master", "commit": "2c72385b627e46bb66f23b8a11da40b4bb127506" },
-  "ripgrep": { "branch": "master", "commit": "61101289fabc032fd8e90009c41d0b78e6dfc9a2" },
-  "rust-tools.nvim": { "branch": "master", "commit": "99fd1238c6068d0637df30b6cee9a264334015e9" },
+  "refactoring.nvim": { "branch": "master", "commit": "b253bcee0488209875fafceda0d0832a121fa3c7" },
+  "ripgrep": { "branch": "master", "commit": "bc5504932764d8d4735bf955f6f7e04a95f151b8" },
+  "rust-tools.nvim": { "branch": "master", "commit": "df584e84393ef255f5b8cbd709677d6a3a5bf42f" },
   "scope.nvim": { "branch": "main", "commit": "2db6d31de8e3a98d2b41c0f0d1f5dc299ee76875" },
   "sessions": { "branch": "main", "commit": "0377fbd47f6a536f10f7ca4646136b4b9e595b5f" },
   "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "304508fb7bea78e3c0eeddd88c4837501e403ae8" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" },
-  "telescope.nvim": { "branch": "master", "commit": "a606bd10c79ec5989c76c49cc6f736e88b63f0da" },
-  "todo-comments.nvim": { "branch": "main", "commit": "c1760010f46992165995aaa52ca967f473a2e8e6" },
-  "tokyonight.nvim": { "branch": "main", "commit": "42cccfe663f36b91792a350164f0695b44a031d9" },
+  "telescope.nvim": { "branch": "master", "commit": "04af51dbfb17c2afa0b8d82b0e842e0638201ca9" },
+  "todo-comments.nvim": { "branch": "main", "commit": "077c59586d9d0726b0696dc5680eb863f4e04bc5" },
+  "tokyonight.nvim": { "branch": "main", "commit": "def91651c41f6d1d43ebcb50763324d35331baee" },
   "undotree": { "branch": "main", "commit": "6cb7e65e03871d2567d2c44745d3de57d07ca1fd" },
   "virt-column.nvim": { "branch": "master", "commit": "36fa3be9cba9195081e934b4f9729021726c5889" },
-  "yanky.nvim": { "branch": "main", "commit": "2bb05abe20b5d7af917a48785acfacb602248e36" }
+  "yanky.nvim": { "branch": "main", "commit": "83bb1dc935b126b59acbd22225a421f0f38a7cde" }
 }
\ No newline at end of file
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index 59d0b7d..aabf84f 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -55,11 +55,14 @@ M.rust_analyzer = {
 M.sumneko_lua = {
 	settings = {
 		Lua = {
+			workspace = {
+				checkThirdParty = false,
+			},
 			completion = {
 				callSnippet = "Replace",
 			},
 			diagnostics = {
-				globals = { "vim", "packer_plugins" },
+				globals = { "vim" },
 			},
 			format = {
 				enable = false,
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
index d95262d..2603adb 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
@@ -26,7 +26,6 @@ local M = {
 			"saadparwaiz1/cmp_luasnip",
 			dependencies = {
 				"L3MON4D3/LuaSnip",
-				config = {},
 			},
 		},
 	},
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
index fe05dad..adf6e5e 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
@@ -5,7 +5,7 @@ local M = {
 		"rcarriga/cmp-dap",
 		{
 			"mfussenegger/nvim-dap-python",
-			config = "",
+			opts = "",
 		},
 		{
 			"leoluz/nvim-dap-go",
@@ -51,27 +51,25 @@ function M.init()
 end
 
 function M.config()
-	local dap = require("dap")
-	local utils = require("tobyvin.utils")
-
-	dap.defaults.fallback.focus_terminal = true
-	dap.defaults.fallback.terminal_win_cmd = "15split new"
+	require("dap").defaults.fallback.focus_terminal = true
+	require("dap").defaults.fallback.terminal_win_cmd = "15split new"
 
 	require("tobyvin.plugins.dap.events").setup()
 	require("tobyvin.plugins.dap.hover").setup()
 
 	local configs = require("tobyvin.plugins.dap.configs")
 	for name, config in pairs(configs) do
-		if dap.configurations[name] == nil then
-			dap.configurations[name] = config
+		if require("dap").configurations[name] == nil then
+			require("dap").configurations[name] = config
 		end
 	end
 
-	vim.fn.sign_define("DapBreakpoint", utils.debug.signs.breakpoint)
-	vim.fn.sign_define("DapBreakpointCondition", utils.debug.signs.condition)
-	vim.fn.sign_define("DapBreakpointRejected", utils.debug.signs.rejected)
-	vim.fn.sign_define("DapStopped", utils.debug.signs.stopped)
-	vim.fn.sign_define("DapLogPoint", utils.debug.signs.logpoint)
+	local signs = require("tobyvin.utils.debug").signs
+	vim.fn.sign_define("DapBreakpoint", signs.breakpoint)
+	vim.fn.sign_define("DapBreakpointCondition", signs.condition)
+	vim.fn.sign_define("DapBreakpointRejected", signs.rejected)
+	vim.fn.sign_define("DapStopped", signs.stopped)
+	vim.fn.sign_define("DapLogPoint", signs.logpoint)
 end
 
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
index 0db036c..36d9ab5 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
@@ -3,80 +3,7 @@ local M = {
 	version = "*",
 	event = "BufReadPre",
 	dependencies = { "nvim-lua/plenary.nvim" },
-}
-
-function M.config()
-	local gitsigns = require("gitsigns")
-
-	local with_range = function(callback)
-		return function()
-			callback(function()
-				local start_pos = vim.fn.getpos("v")
-				local end_pos = vim.fn.getcurpos()
-				return { start_pos[2], end_pos[2] }
-			end)
-		end
-	end
-
-	local show_blameline = function()
-		gitsigns.blame_line({ full = true })
-	end
-
-	local toggle_blameline = function()
-		gitsigns.toggle_current_line_blame()
-	end
-
-	local next_hunk = function()
-		if vim.wo.diff then
-			return "]c"
-		end
-		vim.schedule(function()
-			gitsigns.next_hunk()
-		end)
-		return "<Ignore>"
-	end
-
-	local prev_hunk = function()
-		if vim.wo.diff then
-			return "[c"
-		end
-		vim.schedule(function()
-			gitsigns.prev_hunk()
-		end)
-		return "<Ignore>"
-	end
-
-	local on_attach = function(bufnr)
-		vim.keymap.set("n", "]c", next_hunk, { expr = true, desc = "next hunk", buffer = bufnr })
-		vim.keymap.set("n", "[c", prev_hunk, { expr = true, desc = "previous hunk", buffer = bufnr })
-
-		vim.keymap.set("n", "<leader>gb", gitsigns.blame_line, { desc = "show blame", buffer = bufnr })
-		vim.keymap.set("n", "<leader>gB", show_blameline, { desc = "show blame", buffer = bufnr })
-		vim.keymap.set("n", "<leader>g<C-b>", toggle_blameline, { desc = "toggle blame", buffer = bufnr })
-
-		vim.keymap.set("n", "<leader>gp", gitsigns.preview_hunk, { desc = "preview hunk", buffer = bufnr })
-		vim.keymap.set("n", "<leader>gr", gitsigns.reset_hunk, { desc = "reset hunk", buffer = bufnr })
-		vim.keymap.set("n", "<leader>gs", gitsigns.stage_hunk, { desc = "stage hunk", buffer = bufnr })
-		vim.keymap.set("n", "<leader>gu", gitsigns.undo_stage_hunk, { desc = "undo stage hunk", buffer = bufnr })
-
-		vim.keymap.set("n", "<leader>gR", gitsigns.reset_buffer, { desc = "reset buffer", buffer = bufnr })
-		vim.keymap.set("n", "<leader>gS", gitsigns.stage_buffer, { desc = "stage buffer", buffer = bufnr })
-		vim.keymap.set("n", "<leader>gU", gitsigns.reset_buffer_index, { desc = "undo stage buffer", buffer = bufnr })
-
-		vim.keymap.set("v", "<leader>gp", with_range(gitsigns.preview_hunk), { desc = "preview hunk", buffer = bufnr })
-		vim.keymap.set("v", "<leader>gr", with_range(gitsigns.reset_hunk), { desc = "reset hunk", buffer = bufnr })
-		vim.keymap.set("v", "<leader>gs", with_range(gitsigns.stage_hunk), { desc = "stage hunk", buffer = bufnr })
-		vim.keymap.set(
-			"v",
-			"<leader>gu",
-			with_range(gitsigns.undo_stage_hunk),
-			{ desc = "unstage hunk", buffer = bufnr }
-		)
-
-		vim.api.nvim_exec_autocmds("User", { pattern = "GitAttach", data = { buf = bufnr } })
-	end
-
-	gitsigns.setup({
+	opts = {
 		signs = {
 			add = { text = "▎" },
 			change = { text = "▎" },
@@ -85,8 +12,109 @@ function M.config()
 			changedelete = { text = "▎" },
 		},
 		preview_config = { border = "single" },
-		on_attach = on_attach,
-	})
-end
+		on_attach = function(bufnr)
+			local with_range = function(callback)
+				return function()
+					callback(function()
+						local start_pos = vim.fn.getpos("v")
+						local end_pos = vim.fn.getcurpos()
+						return { start_pos[2], end_pos[2] }
+					end)
+				end
+			end
+
+			local next_hunk = function()
+				if vim.wo.diff then
+					return "]c"
+				end
+				vim.schedule(function()
+					require("gitsigns").next_hunk()
+				end)
+				return "<Ignore>"
+			end
+
+			local prev_hunk = function()
+				if vim.wo.diff then
+					return "[c"
+				end
+				vim.schedule(function()
+					require("gitsigns").prev_hunk()
+				end)
+				return "<Ignore>"
+			end
+
+			vim.keymap.set("n", "]c", next_hunk, { expr = true, desc = "next hunk", buffer = bufnr })
+			vim.keymap.set("n", "[c", prev_hunk, { expr = true, desc = "previous hunk", buffer = bufnr })
+
+			vim.keymap.set("n", "<leader>gb", require("gitsigns").blame_line, { desc = "show blame", buffer = bufnr })
+
+			vim.keymap.set("n", "<leader>gB", function()
+				require("gitsigns").blame_line({ full = true })
+			end, { desc = "show blame", buffer = bufnr })
+
+			vim.keymap.set("n", "<leader>g<C-b>", require("gitsigns").toggle_current_line_blame, {
+				desc = "toggle blame",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gp", require("gitsigns").preview_hunk, {
+				desc = "preview hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gr", require("gitsigns").reset_hunk, {
+				desc = "reset hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gs", require("gitsigns").stage_hunk, {
+				desc = "stage hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gu", require("gitsigns").undo_stage_hunk, {
+				desc = "undo stage hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gR", require("gitsigns").reset_buffer, {
+				desc = "reset buffer",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gS", require("gitsigns").stage_buffer, {
+				desc = "stage buffer",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("n", "<leader>gU", require("gitsigns").reset_buffer_index, {
+				desc = "undo stage buffer",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("v", "<leader>gr", with_range(require("gitsigns").reset_hunk), {
+				desc = "reset hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("v", "<leader>gs", with_range(require("gitsigns").stage_hunk), {
+				desc = "stage hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("v", "<leader>gu", with_range(require("gitsigns").undo_stage_hunk), {
+				desc = "unstage hunk",
+				buffer = bufnr,
+			})
+
+			vim.keymap.set("v", "<leader>gp", with_range(require("gitsigns").preview_hunk), {
+				desc = "preview hunk",
+				buffer = bufnr,
+			})
+
+			vim.api.nvim_exec_autocmds("User", { pattern = "GitAttach", data = { buf = bufnr } })
+		end,
+	},
+}
 
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/init.lua b/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
index 3d114e4..37a7258 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
@@ -5,7 +5,7 @@ return {
 		version = "*",
 		init = function()
 			vim.keymap.set("n", "<leader>p", function()
-				require("lazy.view").show("home")
+				require("lazy").home()
 			end, { desc = "plugins" })
 		end,
 	},
@@ -37,7 +37,7 @@ return {
 	{
 		"akinsho/git-conflict.nvim",
 		event = "BufReadPre",
-		config = {
+		opts = {
 			disable_diagnostics = true,
 			highlights = {
 				incoming = "diffText",
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua
index 22e9e65..9016d76 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua
@@ -11,7 +11,6 @@ function M.config()
 	local lspconfig = require("lspconfig")
 	local configs = require("tobyvin.lsp.configs")
 
-	require("neodev")
 	require("mason")
 
 	require("lspconfig.ui.windows").default_options.border = "single"
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua
index bc9eaaa..18cc4c1 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua
@@ -1,24 +1,16 @@
 local M = {
 	"folke/neodev.nvim",
-	config = {
+	opts = {
 		experimental = {
-			-- much faster, but needs a nightly built of lua-language-server
 			pathStrict = true,
 		},
 		override = function(root_dir, library)
-			local lua_dev_utils = require("lua-dev.util")
-			if lua_dev_utils.has_file(root_dir, lua_dev_utils.fqn("~/.dotfiles/nvim/.config/nvim")) then
+			if root_dir:match("dotfiles") then
+				library.enabled = true
 				library.plugins = true
 			end
 		end,
-		lspconfig = false,
 	},
 }
 
-function M.init()
-	require("tobyvin.lsp.configs").sumneko_lua.before_init = function()
-		require("neodev.lsp").before_init()
-	end
-end
-
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua
index 3d40030..e6dbd2b 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/neogit.lua
@@ -1,74 +1,8 @@
 local M = {
 	"TimUntersberger/neogit",
 	dependencies = { "sindrets/diffview.nvim" },
-}
-
-function M.init()
-	vim.keymap.set("n", "<leader>gg", function()
-		require("neogit").open()
-	end, { desc = "neogit" })
-end
-
--- TODO: revert once #415 is merged
---
--- Refs: https://github.com/TimUntersberger/neogit/pull/415
-local function remove_custom_ft()
-	local Buffer = require("neogit.lib.buffer")
-	local config = require("neogit.config")
-	local input = require("neogit.lib.input")
-
-	local CommitEditor = require("neogit.buffers.commit_editor")
-	function CommitEditor:open()
-		local written = false
-		self.buffer = Buffer.create({
-			name = self.filename,
-			filetype = "gitcommit",
-			buftype = "",
-			kind = config.values.commit_popup.kind,
-			modifiable = true,
-			readonly = false,
-			autocmds = {
-				["BufWritePost"] = function()
-					written = true
-				end,
-				["BufUnload"] = function()
-					if written then
-						if
-							config.values.disable_commit_confirmation
-							or input.get_confirmation("Are you sure you want to commit?")
-						then
-							vim.cmd("silent g/^#/d | silent w!")
-						end
-					end
-					if self.on_unload then
-						self.on_unload(written)
-					end
-					require("neogit.process").defer_show_preview_buffers()
-				end,
-			},
-			mappings = {
-				n = {
-					["q"] = function(buffer)
-						buffer:close(true)
-					end,
-				},
-			},
-			initialize = function(buffer)
-				buffer:set_lines(0, -1, false, self.content)
-				if not config.values.disable_insert_on_commit then
-					vim.cmd(":startinsert")
-				end
-				-- NOTE: This avoids the user having to force to save the contents of the buffer.
-				vim.cmd("silent w!")
-			end,
-		})
-	end
-end
-
-function M.config()
-	remove_custom_ft()
-
-	require("neogit").setup({
+	opts = {
+		auto_show_console = false,
 		disable_context_highlighting = true,
 		disable_commit_confirmation = true,
 		disable_builtin_notifications = true,
@@ -82,10 +16,28 @@ function M.config()
 				["b"] = "",
 			},
 		},
-	})
+	},
+}
+
+function M.init()
+	vim.keymap.set("n", "<leader>gg", function()
+		require("neogit").open()
+	end, { desc = "neogit" })
 
 	vim.api.nvim_set_hl(0, "NeogitHunkHeaderHighlight", { link = "Comment" })
 	vim.api.nvim_set_hl(0, "NeogitHunkHeader", { link = "Comment" })
+
+	-- TODO: revert once #415 is merged
+	--
+	-- Refs: https://github.com/TimUntersberger/neogit/pull/415
+	vim.api.nvim_create_autocmd("FileType", {
+		group = vim.api.nvim_create_augroup("neogit_ft_fix", { clear = true }),
+		pattern = "NeogitCommitMessage",
+		callback = function()
+			vim.bo.filetype = "gitcommit"
+		end,
+		desc = "Vertical help window",
+	})
 end
 
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua b/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua
index 2a2c170..84c1ca9 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua
@@ -8,7 +8,7 @@ local M = {
 		"MunifTanjim/nui.nvim",
 		"rcarriga/nvim-notify",
 	},
-	config = {
+	opts = {
 		cmdline = { enabled = false },
 		messages = { enabled = false },
 		popupmenu = {
@@ -115,15 +115,15 @@ function M.init()
 
 	vim.keymap.set("n", "<leader>nn", function()
 		require("noice").cmd("history")
-	end)
+	end, { desc = "message history" })
 
 	vim.keymap.set("n", "<leader>nl", function()
 		require("noice").cmd("last")
-	end)
+	end, { desc = "last message" })
 
 	vim.keymap.set("n", "<leader>ne", function()
 		require("noice").cmd("errors")
-	end)
+	end, { desc = "error messages" })
 
 	-- TODO: figure out why setting `remap = true` fails to call the `<C-d>zz` mapping
 	vim.keymap.set("n", "<C-d>", function()
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua b/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua
index 31189cb..9ee4fb0 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua
@@ -1,10 +1,8 @@
 local M = {
 	"rcarriga/nvim-notify",
-	event = "VeryLazy",
-	config = {
+	opts = {
 		timeout = 3000,
-		level = vim.log.levels.INFO,
-		fps = 20,
+		background_colour = "Pmenu",
 		max_height = function()
 			return math.floor(vim.o.lines * 0.75)
 		end,
@@ -14,8 +12,4 @@ local M = {
 	},
 }
 
-function M.init()
-	vim.api.nvim_set_hl(0, "NotifyBackground", { link = "WinBar" })
-end
-
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua b/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua
index 0fce110..66a56e2 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua
@@ -6,7 +6,7 @@ local M = {
 		"nvim-lua/plenary.nvim",
 		"mfussenegger/nvim-dap",
 	},
-	config = {
+	opts = {
 		tools = {
 			hover_actions = {
 				border = "single",
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/undotree.lua b/nvim/.config/nvim/lua/tobyvin/plugins/undotree.lua
index 2f0dec1..47f24ef 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/undotree.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/undotree.lua
@@ -4,7 +4,7 @@ local M = {
 		"nvim-lua/plenary.nvim",
 	},
 	cmd = "UndoTree",
-	config = {
+	opts = {
 		window = {
 			winblend = 0,
 		},
@@ -14,7 +14,7 @@ local M = {
 function M.init()
 	vim.api.nvim_create_user_command("UndoTree", function()
 		require("undotree").open()
-	end, {})
+	end, { desc = "toggle undotree" })
 end
 
 return M