feat(nvim): remove unused plugins and cleanup keybinds

17 files changed, 55 insertions, 442 deletions

diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 99bea89..f1b7215 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,3 +1,3 @@
+pcall(require, "impatient")
 
 require("tobyvin").setup()
-
diff --git a/nvim/.config/nvim/lua/tobyvin/keymaps.lua b/nvim/.config/nvim/lua/tobyvin/keymaps.lua
index 3322916..0e5be19 100644
--- a/nvim/.config/nvim/lua/tobyvin/keymaps.lua
+++ b/nvim/.config/nvim/lua/tobyvin/keymaps.lua
@@ -6,6 +6,8 @@ M.training_wheels = function()
 end
 
 M.setup = function()
+	vim.keymap.set("n", "gn", "<cmd>bnext<cr>", { desc = "bnext" })
+	vim.keymap.set("n", "gp", "<cmd>bprev<cr>", { desc = "bprev" })
 	vim.keymap.set("n", "<leader>q", "<cmd>qall<cr>", { desc = "quit" })
 	vim.keymap.set("n", "<leader>c", utils.buffer.bdelete, { desc = "bdelete" })
 	vim.keymap.set("n", "<leader>x", "<cmd>close<cr>", { desc = "close" })
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/init.lua b/nvim/.config/nvim/lua/tobyvin/lsp/init.lua
index 5c7379a..c5b4ff6 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/init.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/init.lua
@@ -21,12 +21,11 @@ lsp.on_attach = function(client, bufnr)
 	vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "Implementation", buffer = bufnr })
 	vim.keymap.set("n", "gr", vim.lsp.buf.references, { desc = "References", buffer = bufnr })
 
-	utils.keymap.group("n", "gp", { desc = "Preview", buffer = bufnr })
-	vim.keymap.set("n", "gpd", lsp.handlers.preview.definition, { desc = "Definition", buffer = bufnr })
-	vim.keymap.set("n", "gpD", lsp.handlers.preview.declaration, { desc = "Declaration", buffer = bufnr })
-	vim.keymap.set("n", "gpt", lsp.handlers.preview.type_definition, { desc = "Type", buffer = bufnr })
-	vim.keymap.set("n", "gpi", lsp.handlers.preview.implementation, { desc = "Implementation", buffer = bufnr })
-	vim.keymap.set("n", "gpr", lsp.handlers.preview.references, { desc = "References", buffer = bufnr })
+	vim.keymap.set("n", "g<C-d>", lsp.handlers.preview.definition, { desc = "Definition", buffer = bufnr })
+	vim.keymap.set("n", "g<CS-D>", lsp.handlers.preview.declaration, { desc = "Declaration", buffer = bufnr })
+	vim.keymap.set("n", "g<C-t>", lsp.handlers.preview.type_definition, { desc = "Type", buffer = bufnr })
+	vim.keymap.set("n", "g<C-i>", lsp.handlers.preview.implementation, { desc = "Implementation", buffer = bufnr })
+	vim.keymap.set("n", "g<C-r>", lsp.handlers.preview.references, { desc = "References", buffer = bufnr })
 
 	utils.keymap.group("n", "<leader>l", { desc = "LSP", buffer = bufnr })
 	vim.keymap.set("n", "<leader>li", "<CMD>LspInfo<CR>", { desc = "LSP info" })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index 7dc5666..cc180d1 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -1,42 +1,31 @@
+---@diagnostic disable: missing-parameter
 local utils = require("tobyvin.utils")
 local M = {}
 
-M.plugins = function(use)
-	---@diagnostic disable-next-line: unused-local, unused-function
-	local local_use = function(opts, skip_missing)
-		skip_missing = vim.F.if_nil(skip_missing, false)
-
-		if type(opts) == "string" then
-			opts = { opts }
-		end
-
-		---@diagnostic disable-next-line: missing-parameter
-		local local_path = vim.fn.expand("~/src/" .. vim.fs.basename(opts[1]))
-		if vim.fn.isdirectory(local_path) == 1 then
-			opts[1] = local_path
-		else
-			local notif_opts = { title = "[Packer] Missing local plugin" }
-			local notif_msg = string.format("Failed to find local plugin: %s", local_path)
-			if skip_missing then
-				vim.notify(string.format("%s\nSkipping.", notif_msg), vim.log.levels.WARN, notif_opts)
-				return
-			end
-			vim.notify(string.format("%s\nFalling back to '%s'", notif_msg, opts[1]), vim.log.levels.WARN, notif_opts)
-		end
+M.ensure_packer = function()
+	local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
+	if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+		vim.fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
+		vim.cmd([[packadd packer.nvim]])
+		return true
+	end
+	return false
+end
 
-		use(opts)
+M.try_local = function(opts)
+	if type(opts) == "string" then
+		opts = { opts }
+	end
+	local local_path = vim.fn.expand("~/src/" .. vim.fs.basename(opts[1]))
+	if vim.fn.isdirectory(local_path) == 1 then
+		opts[1] = local_path
 	end
+	return opts
+end
 
+M.plugins = function(use)
 	use("wbthomason/packer.nvim")
 
-	use({
-		"dstein64/vim-startuptime",
-		cmd = "StartupTime",
-		config = function()
-			vim.g.startuptime_tries = 3
-		end,
-	})
-
 	use("lewis6991/impatient.nvim")
 
 	use({
@@ -49,6 +38,7 @@ M.plugins = function(use)
 
 	use({
 		"rcarriga/nvim-notify",
+		event = "VimEnter",
 		config = function()
 			require("tobyvin.plugins.notify").setup()
 		end,
@@ -62,13 +52,6 @@ M.plugins = function(use)
 	})
 
 	use({
-		"andweeb/presence.nvim",
-		config = function()
-			require("tobyvin.plugins.presence").setup()
-		end,
-	})
-
-	use({
 		"ellisonleao/gruvbox.nvim",
 		config = function()
 			require("tobyvin.plugins.gruvbox").setup()
@@ -90,16 +73,6 @@ M.plugins = function(use)
 	})
 
 	use({
-		"tpope/vim-dispatch",
-		cmd = {
-			"Dispatch",
-			"Make",
-			"Focus",
-			"Start",
-		},
-	})
-
-	use({
 		"williamboman/mason.nvim",
 		config = function()
 			require("tobyvin.plugins.mason").setup()
@@ -206,13 +179,6 @@ M.plugins = function(use)
 	})
 
 	use({
-		"mickael-menu/zk-nvim",
-		config = function()
-			require("tobyvin.plugins.zk").setup()
-		end,
-	})
-
-	use({
 		"hrsh7th/nvim-cmp",
 		requires = {
 			"hrsh7th/cmp-nvim-lsp",
@@ -264,13 +230,6 @@ M.plugins = function(use)
 	})
 
 	use({
-		"simrat39/symbols-outline.nvim",
-		config = function()
-			require("symbols-outline").setup()
-		end,
-	})
-
-	use({
 		"kevinhwang91/nvim-bqf",
 		requires = {
 			"nvim-treesitter/nvim-treesitter",
@@ -297,7 +256,6 @@ M.plugins = function(use)
 			"nvim-telescope/telescope-dap.nvim",
 			"nvim-telescope/telescope-packer.nvim",
 			"nvim-telescope/telescope-github.nvim",
-			"ThePrimeagen/git-worktree.nvim",
 		},
 		config = function()
 			require("tobyvin.plugins.telescope").setup()
@@ -339,41 +297,6 @@ M.plugins = function(use)
 		end,
 	})
 
-	use({
-		"lewis6991/spellsitter.nvim",
-		requires = { "nvim-treesitter/nvim-treesitter" },
-		config = function()
-			require("tobyvin.plugins.spellsitter").setup()
-		end,
-	})
-
-	use({
-		"drybalka/tree-climber.nvim",
-		requires = { "nvim-treesitter/nvim-treesitter" },
-		config = function()
-			require("tobyvin.plugins.tree-climber").setup()
-		end,
-	})
-
-	use({
-		"ThePrimeagen/refactoring.nvim",
-		requires = {
-			"nvim-lua/plenary.nvim",
-			"nvim-treesitter/nvim-treesitter",
-		},
-		config = function()
-			require("tobyvin.plugins.refactoring").setup()
-		end,
-	})
-
-	use({
-		"danymat/neogen",
-		requires = "nvim-treesitter/nvim-treesitter",
-		config = function()
-			require("tobyvin.plugins.neogen").setup()
-		end,
-	})
-
 	use("norcalli/nvim-colorizer.lua")
 
 	use({
@@ -465,13 +388,6 @@ M.plugins = function(use)
 	})
 
 	use({
-		"ThePrimeagen/git-worktree.nvim",
-		config = function()
-			require("tobyvin.plugins.git-worktree").setup()
-		end,
-	})
-
-	use({
 		"folke/which-key.nvim",
 		config = function()
 			require("tobyvin.plugins.which-key").setup()
@@ -521,15 +437,14 @@ M.plugins = function(use)
 		end,
 	})
 
-	use({ "ellisonleao/glow.nvim" })
-	use("nacro90/numb.nvim")
+	use("ellisonleao/glow.nvim")
 	use("ThePrimeagen/harpoon")
 	use("b0o/SchemaStore.nvim")
 
 	use({
-		"ggandor/leap.nvim",
+		"nacro90/numb.nvim",
 		config = function()
-			require("tobyvin.plugins.leap").setup()
+			require("numb").setup()
 		end,
 	})
 
@@ -553,64 +468,40 @@ M.plugins = function(use)
 			require("scope").setup()
 		end,
 	})
-
-	use("SmiteshP/nvim-gps")
-
-	if PackerBootstrap then
-		require("packer").sync()
-	end
-end
-
-M.open_log = function()
-	utils.buffer.popup(vim.fn.stdpath("cache") .. "/packer.nvim.log")
 end
 
 M.setup = function()
-	local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
-	---@diagnostic disable-next-line: missing-parameter
-	if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
-		PackerBootstrap = vim.fn.system({
-			"git",
-			"clone",
-			"--depth",
-			"1",
-			"https://github.com/wbthomason/packer.nvim",
-			install_path,
-		})
-		vim.notify(
-			"Installing packer. Reload neovim to load plugins.",
-			vim.log.levels.INFO,
-			{ title = "[packer] Installing" }
-		)
-		vim.cmd([[packadd packer.nvim]])
-	end
-
+	local packer_bootstrap = M.ensure_packer()
 	local status_ok, packer = pcall(require, "packer")
 	if not status_ok then
 		vim.notify("Failed to load module 'packer'", vim.log.levels.ERROR)
 		return
 	end
 
-	packer.init({
-		display = {
-			open_fn = function()
-				return require("packer.util").float({ border = "rounded" })
-			end,
+	utils.keymap.group("n", "<leader>p", { desc = "Packer" })
+	vim.keymap.set("n", "<leader>pc", packer.compile, { desc = "Compile" })
+	vim.keymap.set("n", "<leader>pC", packer.clean, { desc = "Clean" })
+	vim.keymap.set("n", "<leader>pi", packer.install, { desc = "Install" })
+	vim.keymap.set("n", "<leader>pp", packer.profile_output, { desc = "Profile" })
+	vim.keymap.set("n", "<leader>ps", packer.sync, { desc = "Sync" })
+	vim.keymap.set("n", "<leader>pu", packer.update, { desc = "Update" })
+
+	return packer.startup({
+		function(...)
+			M.plugins(...)
+			if packer_bootstrap then
+				packer.sync()
+			end
+		end,
+		config = {
+			display = {
+				open_fn = function()
+					return require("packer.util").float({ border = "rounded" })
+				end,
+			},
+			autoremove = true,
 		},
-		autoremove = true,
-		profile = { enable = true },
 	})
-
-	local nmap = utils.keymap.group("n", "<leader>p", { desc = "Packer" })
-	nmap("c", packer.compile, { desc = "Compile" })
-	nmap("C", packer.clean, { desc = "Clean" })
-	nmap("i", packer.install, { desc = "Install" })
-	nmap("p", packer.profile_output, { desc = "Profile" })
-	nmap("s", packer.sync, { desc = "Sync" })
-	nmap("u", packer.update, { desc = "Update" })
-	nmap("l", M.open_log, { desc = "Log" })
-
-	return packer.startup(M.plugins)
 end
 
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua b/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua
deleted file mode 100644
index 1337c76..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/bufferline.lua
+++ /dev/null
@@ -1,49 +0,0 @@
----@diagnostic disable: assign-type-mismatch
-local utils = require("tobyvin.utils")
-local M = {}
-
-M.diagnostics_indicator = function(_, _, errors, _)
-	local outstr = " "
-	for level, count in pairs(errors) do
-		local sign = utils.diagnostic.signs[level:gsub("warning", "warn")].text
-		-- outstr = outstr .. sign .. (#count > 1 and count or "")
-		outstr = outstr .. sign .. count
-	end
-	return outstr
-end
-
-M.setup = function()
-	local status_ok, bufferline = pcall(require, "bufferline")
-	if not status_ok then
-		vim.notify("failed to load module 'bufferline'", vim.log.levels.ERROR)
-		return
-	end
-
-	bufferline.setup({
-		-- highlights = {
-		-- 	fill = {
-		-- 		guibg = {
-		-- 			attribute = "fg",
-		-- 			highlight = "Pmenu",
-		-- 		},
-		-- 	},
-		-- },
-		options = {
-			right_mouse_command = "buffer %d",
-			always_show_bufferline = false,
-			color_icons = false,
-			show_close_icon = false,
-			show_buffer_close_icons = false,
-			diagnostics = "nvim_lsp",
-			diagnostics_indicator = M.diagnostics_indicator,
-			left_trunc_marker = "<",
-			right_trunc_marker = ">",
-		},
-	})
-
-	local nmap = utils.keymap.group("n", "<leader>b", { desc = "Buffers" })
-	nmap("c", bufferline.close_with_pick, { desc = "Close Buffer" })
-	nmap("b", bufferline.pick_buffer, { desc = "Pick Buffer" })
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/formatter.lua b/nvim/.config/nvim/lua/tobyvin/plugins/formatter.lua
deleted file mode 100644
index a07cd2f..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/formatter.lua
+++ /dev/null
@@ -1,37 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, formatter = pcall(require, "formatter")
-	if not status_ok then
-		vim.notify("Failed to load module 'formatter'", vim.log.levels.ERROR)
-		return
-	end
-
-	formatter.setup({
-		filetype = {
-			lua = {
-				require("formatter.filetypes.lua").stylua,
-			},
-			sh = {
-				require("formatter.filetypes.sh").shfmt,
-			},
-			javascript = {
-				require("formatter.filetypes.javascript").prettier,
-			},
-			markdown = {
-				require("formatter.filetypes.markdown").prettier,
-			},
-			python = {
-				require("formatter.filetypes.python").black,
-			},
-			["*"] = {
-				require("formatter.filetypes.any").remove_trailing_whitespace,
-			},
-		},
-	})
-
-  vim.keymap.set("n", "<leader>lf", "<CMD>Format<CR>", { desc = "Format" })
-  vim.keymap.set("n", "<leader>lF", "<CMD>FormatWrite<CR>", { desc = "Format Write" })
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/git-worktree.lua b/nvim/.config/nvim/lua/tobyvin/plugins/git-worktree.lua
deleted file mode 100644
index 1d33491..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/git-worktree.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, git_worktree = pcall(require, "git-worktree")
-	if not status_ok then
-		vim.notify("Failed to load module 'git-worktree'", vim.log.levels.ERROR)
-		return
-	end
-
-	git_worktree.setup({})
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/leap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/leap.lua
deleted file mode 100644
index 612a759..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/leap.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-local M = {}
-
-M.highlights = function()
-	-- vim.api.nvim_set_hl(0, "LeapMatch", { link = "IncSearch" })
-	-- vim.api.nvim_set_hl(0, "LeapLabelSelected", { link = "IncSearch" })
-	vim.api.nvim_set_hl(0, "LeapLabelPrimary", { link = "IncSearch" })
-	-- vim.api.nvim_set_hl(0, "LeapLabelSecondary", { link = "IncSearch" })
-end
-
-M.setup = function()
-	local status_ok, leap = pcall(require, "leap")
-	if not status_ok then
-		vim.notify("Failed to load module 'leap'", vim.log.levels.ERROR)
-		return
-	end
-
-	leap.set_default_keymaps()
-
-	M.highlights()
-
-	vim.api.nvim_create_autocmd("ColorScheme", {
-		callback = M.highlights,
-	})
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lint.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lint.lua
deleted file mode 100644
index 255a6a3..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/lint.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, lint = pcall(require, "lint")
-	if not status_ok then
-		vim.notify("Failed to load module 'lint'", vim.log.levels.ERROR)
-		return
-	end
-
-	lint.linters_by_ft = {
-		markdown = { "vale" },
-		python = { "pylint" },
-	}
-
-	vim.api.nvim_create_autocmd({ "BufWritePost" }, {
-		callback = function()
-			lint.try_lint()
-		end,
-	})
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neogen.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neogen.lua
deleted file mode 100644
index 99d5ce0..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/neogen.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, neogen = pcall(require, "neogen")
-	if not status_ok then
-		vim.notify("Failed to load module 'neogen'", vim.log.levels.ERROR)
-		return
-	end
-
-	local nmap = require("tobyvin.utils").keymap.group("n", "<leader>s", { desc = "Snippets" })
-
-	neogen.setup({ snippet_engine = "luasnip" })
-
-	nmap("d", neogen.generate)
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/presence.lua b/nvim/.config/nvim/lua/tobyvin/plugins/presence.lua
deleted file mode 100644
index 72a98c3..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/presence.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, presence = pcall(require, "presence")
-	if not status_ok then
-		vim.notify("Failed to load module 'presence'", vim.log.levels.ERROR)
-		return
-	end
-
-	presence:setup()
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/refactoring.lua b/nvim/.config/nvim/lua/tobyvin/plugins/refactoring.lua
deleted file mode 100644
index 425b06b..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/refactoring.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-local utils = require("tobyvin.utils")
-local M = {}
-
-M.setup = function()
-  -- TODO: fix or find a better option, also appeared to have a high load time when running packer profile
-	-- local status_ok, refactoring = pcall(require, "refactoring")
-	-- if not status_ok then
-	-- 	vim.notify("Failed to load module 'refactoring'", vim.log.levels.ERROR)
-	-- 	return
-	-- end
- --
-	-- refactoring.setup()
- --
-	-- local nmap = utils.keymap.group("n", "<leader>r", { desc = "Refactor" })
-	-- nmap("b", function()
-	-- 	refactoring.refactor("Extract Block")
-	-- end, { desc = "Extract Block" })
-	-- nmap("B", function()
-	-- 	refactoring.refactor("Extract Block To File")
-	-- end, { desc = "Extract Block To File" })
-	-- nmap("i", function()
-	-- 	refactoring.refactor("Inline Variable")
-	-- end, { desc = "Inline Variable" })
- --
- --  -- TODO: Fix needing to exit visual mode
-	-- local vmap = utils.keymap.group("v", "<leader>r", { desc = "Refactor" })
-	-- vmap("e", function()
-	-- 	refactoring.refactor("Extract Function")
-	-- end, { desc = "Extract Function" })
-	-- vmap("f", function()
-	-- 	refactoring.refactor("Extract Function To File")
-	-- end, { desc = "Extract Function To File" })
-	-- vmap("v", function()
-	-- 	refactoring.refactor("Extract Variable")
-	-- end, { desc = "Extract Variable" })
-	-- vmap("i", function()
-	-- 	refactoring.refactor("Inline Variable")
-	-- end, { desc = "Inline Variable" })
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/spellsitter.lua b/nvim/.config/nvim/lua/tobyvin/plugins/spellsitter.lua
deleted file mode 100644
index 5568b6f..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/spellsitter.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, spellsitter = pcall(require, "spellsitter")
-	if not status_ok then
-		vim.notify("Failed to load module 'spellsitter'", vim.log.levels.ERROR)
-		return
-	end
-
-	spellsitter.setup()
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua b/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
index 25f08fd..c3ed3bd 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
@@ -132,14 +132,10 @@ M.setup = function()
 		group = vim.api.nvim_create_augroup("tobyvin_telescope", { clear = true }),
 		pattern = "GitAttach",
 		callback = function(args)
-			telescope.load_extension("git_worktree")
-			local wt = telescope.extensions.git_worktree
 			local bufnr = vim.F.if_nil(args.data.buf, args.buf)
 			vim.keymap.set("n", "<leader>gb", builtins.git_branches, { desc = "Checkout branch", buffer = bufnr })
 			vim.keymap.set("n", "<leader>gc", builtins.git_commits, { desc = "Checkout commit", buffer = bufnr })
 			vim.keymap.set("n", "<leader>gd", builtins.git_status, { desc = "Git diffs", buffer = bufnr })
-			vim.keymap.set("n", "<leader>gw", wt.git_worktrees, { desc = "Switch worktree", buffer = bufnr })
-			vim.keymap.set("n", "<leader>gW", wt.create_git_worktree, { desc = "Create worktree", buffer = bufnr })
 		end,
 	})
 end
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/tree-climber.lua b/nvim/.config/nvim/lua/tobyvin/plugins/tree-climber.lua
deleted file mode 100644
index 3fa8a44..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/tree-climber.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, tree_climber = pcall(require, "tree-climber")
-	if not status_ok then
-		vim.notify("Failed to load module 'tree-climber'", vim.log.levels.ERROR)
-		return
-	end
-
-	vim.keymap.set({ "n", "v", "o" }, "<s-h>", tree_climber.goto_parent, { desc = "Goto Parent" })
-	vim.keymap.set({ "n", "v", "o" }, "<s-l>", tree_climber.goto_child, { desc = "Goto Child" })
-	vim.keymap.set({ "n", "v", "o" }, "<s-j>", tree_climber.goto_next, { desc = "Goto Next" })
-	vim.keymap.set({ "n", "v", "o" }, "<s-k>", tree_climber.goto_prev, { desc = "Goto Prev" })
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
index 1408ec7..54f1ce8 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
@@ -32,20 +32,6 @@ M.setup = function()
 		playground = {
 			enable = true,
 		},
-		refactor = {
-			smart_rename = {
-				enable = true,
-				keymaps = {
-					smart_rename = "<leader>lr",
-				},
-			},
-			navigation = {
-				enable = true,
-				keymaps = {
-					goto_definition_lsp_fallback = "gd",
-				},
-			},
-		},
 		textobjects = {
 			select = {
 				enable = true,
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/zk.lua b/nvim/.config/nvim/lua/tobyvin/plugins/zk.lua
deleted file mode 100644
index db3b0a7..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/zk.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, zk = pcall(require, "zk")
-	if not status_ok then
-		vim.notify("Failed to load module 'zk'", vim.log.levels.ERROR)
-		return
-	end
-
-	-- vim.keymap.set("n", "<leader>u", zk.toggle, { desc = "Toggle zk" })
-	zk.setup()
-end
-
-return M