Update 2025-01-22

2025-10-21 20:10:41 +00:00 · 2025-01-22 13:39:10 +02:00 · 2025-01-22 13:39:10 +02:00 · e73c3b0732
commit e73c3b0732
parent afd4e86207
26 changed files with 101 additions and 331 deletions
--- a/lazy-lock.json
+++ b/lazy-lock.json
@ -20,17 +20,15 @@
  "conform.nvim": { "branch": "master", "commit": "6dc21d4ce050c2e592d9635b7983d67baf216e3d" },
  "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" },
  "cratesearch.nvim": { "branch": "master", "commit": "9d09625d017f6b2e116503f935bc6862961313fa" },
-  "curl.nvim": { "branch": "main", "commit": "fe07677a2a24bc8793b90fa2c0da626ea6c9e47d" },
+  "csvview.nvim": { "branch": "main", "commit": "b5e57ee599d91c7eb6915df6b515915501b0b7df" },
  "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" },
  "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" },
-  "decisive.nvim": { "branch": "main", "commit": "a7251adebccbc9c899cff39a524b20d06e2b78b5" },
  "demicolon.nvim": { "branch": "main", "commit": "b5d20271a28b42edb509006783bd425c750d0f4a" },
  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
  "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" },
  "flow.nvim": { "branch": "main", "commit": "d8b2bc1a76325361fdbb2cdadbfe242d24370edd" },
  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "gh.nvim": { "branch": "main", "commit": "ebbaac254ef7dd6f85b439825fbce82d0dc84515" },
-  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
+  "gh.nvim": { "branch": "main", "commit": "6f367b2ab8f9d4a0a23df2b703a3f91137618387" },
  "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" },
  "gitpad.nvim": { "branch": "main", "commit": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" },
  "gitsigns.nvim": { "branch": "main", "commit": "f9170c3b74d94525201e5a40543d8924a2a883a7" },
@ -38,11 +36,9 @@
  "hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" },
  "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
  "harpoon-lualine": { "branch": "master", "commit": "eae10bc6bddddbc73daa0956ba4ee5cc29cf9a49" },
-  "hot-reload.nvim": { "branch": "main", "commit": "b69e116cb1ebf70a4c5a2e70b9f104c3e529eaf9" },
  "http-codes.nvim": { "branch": "main", "commit": "a610788dff2fb5df05b230d73a926c8dc3173c16" },
  "hypersonic.nvim": { "branch": "main", "commit": "734dfbfbe51952f102a9b439d53d4267bb0024cd" },
  "image.nvim": { "branch": "master", "commit": "b991fc7f845bc6ab40c6ec00b39750dcd5190010" },
-  "in-and-out.nvim": { "branch": "master", "commit": "ab24cafadc3418dffb0c7e9b0621cff60b9ac551" },
  "indent-blankline.nvim": { "branch": "master", "commit": "7a698a1d7ed755af9f5a88733b23ca246ce2df28" },
  "inlay-hint.nvim": { "branch": "main", "commit": "eb5f0579537db271dfedd7f38460cdacb238176f" },
  "inlay-hints.nvim": { "branch": "master", "commit": "3259b54f3b954b4d8260f3ee49ceabe978ea5636" },
@ -86,9 +82,8 @@
  "nvim-dap-ui": { "branch": "master", "commit": "0d5c37a43bc039c42a0a9bf801e53f77adf06a24" },
  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
  "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
-  "nvim-justice": { "branch": "main", "commit": "8a310b655b887d6e07f015b687fff09a16ef177e" },
  "nvim-lint": { "branch": "master", "commit": "ec9fda13a5254783a80b37563ed5eb97b75c28b7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "3d4180a5ef085b9da249919cce01c62b53c07d6a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d9fbdafd80350b38c15521e11e66936032ed90d1" },
  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
  "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" },
  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
@ -97,9 +92,8 @@
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
  "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
+  "nvim-ufo": { "branch": "main", "commit": "4c64d89c2bf174d95d4ac91cc959a9e43e2f318c" },
  "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
-  "ohne-accidents": { "branch": "main", "commit": "832b942a928e74b537a2526eacc6285e26af9589" },
  "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
  "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
  "otter.nvim": { "branch": "main", "commit": "e8c662e1aefa8b483cfba6e00729a39a363dcecc" },
@ -109,15 +103,12 @@
  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "py-requirements.nvim": { "branch": "main", "commit": "433fcb9489e48c73111c14e6c1fdc0cee0df3c51" },
  "pymple.nvim": { "branch": "main", "commit": "110cc9499b89f2b7230a0c3a7332b3e4b1ac5b7b" },
  "rainbow-delimiters.nvim": { "branch": "master", "commit": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11" },
  "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" },
  "rose-pine.nvim": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" },
-  "runner.nvim": { "branch": "main", "commit": "eb089f54a675d7cf5e5b3c4fd6700971e61a095c" },
  "rustaceanvim": { "branch": "master", "commit": "0a1876b970ab946be3f4d341e9d743a5d62d646a" },
  "spellwarn.nvim": { "branch": "main", "commit": "12734b47b008d912b4925c0bc2c1248eb534409d" },
-  "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
  "tagbar": { "branch": "master", "commit": "8de7694c0aeda253073098bbc9fb890b2902ddb8" },
  "tailwind-fold.nvim": { "branch": "main", "commit": "30b8c04eec28628fbe554fb4f3a26984c4455176" },
  "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" },
@ -132,11 +123,13 @@
  "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" },
  "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "timber.nvim": { "branch": "main", "commit": "7e96bc1a01cea35e872e4ac387edfc1c68ca37f6" },
  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
  "tokyonight.nvim": { "branch": "main", "commit": "c3ab53c3f544e4a04f2a05d43451fd9bedff51b4" },
  "tree-sitter-bruno": { "branch": "main", "commit": "347e99f256930213cd7fcd0efe3f9af83035c4b1" },
  "treesitter-utils": { "branch": "main", "commit": "df621499e4227f0476f6f4bdb75a9d8dd18d16f2" },
  "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
+  "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
  "ts-error-translator.nvim": { "branch": "main", "commit": "47e5ba89f71b9e6c72eaaaaa519dd59bd6897df4" },
  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
  "typecheck.nvim": { "branch": "main", "commit": "38f3c135572a287f468bae269f956f4ba53dbddf" },
@ -147,7 +140,6 @@
  "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
  "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" },
-  "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
  "vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" },
  "vimtex": { "branch": "master", "commit": "3f0bdcfbe8167c081cd83153910c871b681c1d8f" },
  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" },
--- a/lua/plugins/autopairs.lua
+++ b/lua/plugins/autopairs.lua
@ -1,5 +1,6 @@
 return {
 	"windwp/nvim-autopairs",
+	enabled = false,
 	event = "InsertEnter",
 	opts = {
 		disable_filetype = { "TelescopePrompt", "spectre_panel" },
--- a/lua/plugins/blink.lua
+++ b/lua/plugins/blink.lua
@ -24,8 +24,6 @@ return {
 			},
 		},
 		version = "*",
-		-- build = "cargo build --release", -- build from source
-
 		opts = {
 			-- "default" for mappings similar to built-in completion
 			-- "super-tab" for mappings similar to vscode (tab to accept, arrow keys to navigate)
--- a/lua/plugins/cellular-automaton.lua
+++ b/lua/plugins/cellular-automaton.lua
@ -7,4 +7,5 @@ return {
 			desc = "[M]ake it [R]ain",
 		},
 	},
+	cmd = "CellularAutomaton",
 }
--- a/lua/plugins/csv.lua
+++ b/lua/plugins/csv.lua
@ -0,0 +1,34 @@
+local ft = {
+	"csv",
+	"tsv",
+	"csv_semicolon",
+	"csv_whitespace",
+	"csv_pipe",
+	"rfc_csv",
+	"rfc_semicolon",
+}
+return {
+	{
+		"cameron-wags/rainbow_csv.nvim",
+		ft = ft,
+		cmd = {
+			"RainbowDelim",
+			"RainbowDelimSimple",
+			"RainbowDelimQuoted",
+			"RainbowMultiDelim",
+		},
+		opts = true,
+	},
+	{
+		"hat0uma/csvview.nvim",
+		ft = ft,
+		cmd = {
+			"CsvViewEnable",
+			"CsvViewDisable",
+			"CsvViewToggle",
+		},
+		config = function()
+			require("csvview").setup()
+		end,
+	},
+}
--- a/lua/plugins/curl.lua
+++ b/lua/plugins/curl.lua
@ -1,25 +0,0 @@
-return {
-	"oysandvik94/curl.nvim",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-	},
-	keys = {
-		{
-			"<leader>co",
-			vim.cmd.CurlOpen,
-			desc = "[C]url [O]pen",
-		},
-		{
-			"<leader>cc",
-			vim.cmd.CurlClose,
-			desc = "[C]url [C]lose",
-		},
-	},
-	cmd = { "CurlOpen", "CurlClose" },
-	opts = {
-		default_flags = {},
-		mappings = {
-			execute_curl = "<CR>",
-		},
-	},
-}
--- a/lua/plugins/decisive.lua
+++ b/lua/plugins/decisive.lua
@ -1,34 +0,0 @@
-return {
-	"emmanueltouzery/decisive.nvim",
-	keys = {
-		{
-			"<leader>cCa",
-			function()
-				require("decisive").align_csv({})
-			end,
-			desc = "align CSV",
-		},
-		{
-			"<leader>cCA",
-			function()
-				require("decisive").align_csv_clear({})
-			end,
-			desc = "align CSV clear",
-		},
-		{
-			"[c",
-			function()
-				require("decisive").align_csv_prev_col()
-			end,
-			desc = "align CSV prev col",
-		},
-		{
-			"]c",
-			function()
-				require("decisive").align_csv_next_col()
-			end,
-			desc = "align CSV next col",
-		},
-	},
-	opts = {},
-}
--- a/lua/plugins/hot-reload.lua
+++ b/lua/plugins/hot-reload.lua
@ -1,6 +0,0 @@
-return {
-	"Zeioth/hot-reload.nvim",
-	dependencies = "nvim-lua/plenary.nvim",
-	event = "BufEnter",
-	opts = {},
-}
--- a/lua/plugins/in-and-out.lua
+++ b/lua/plugins/in-and-out.lua
@ -1,8 +0,0 @@
-return {
-	"ysmb-wtsg/in-and-out.nvim",
-	config = function()
-		vim.keymap.set("i", "<C-l>", function()
-			require("in-and-out").in_and_out()
-		end)
-	end,
-}
--- a/lua/plugins/jq.lua
+++ b/lua/plugins/jq.lua
@ -5,6 +5,7 @@ return {
 		"MunifTanjim/nui.nvim",
 		"grapp-dev/nui-components.nvim",
 	},
+	cmd = "JQ",
 	opts = {
 		keymap = {
 			close = "<Esc>",
--- a/lua/plugins/just.lua
+++ b/lua/plugins/just.lua
@ -1,3 +0,0 @@
-return {
-	"chrisgrieser/nvim-justice",
-}
--- a/lua/plugins/nvim-lint.lua
+++ b/lua/plugins/nvim-lint.lua
@ -8,7 +8,7 @@ return {
 			javascriptreact = js,
 			typescript = js,
 			typescriptreact = js,
-			-- python = { "mypy" },
+			python = { "mypy" },
 			htmldjango = { "djlint" },
 			html = { "djlint" },
 			lua = { "selene" },
--- a/lua/plugins/ohne-accidents.lua
+++ b/lua/plugins/ohne-accidents.lua
@ -1,11 +0,0 @@
-return {
-	"blumaa/ohne-accidents",
-	keys = {
-		{
-			"<leader>oh",
-			vim.cmd.OhneAccidents,
-			desc = "Run OhneAccidents",
-		},
-	},
-	opts = {},
-}
--- a/lua/plugins/project-starter.lua
+++ b/lua/plugins/project-starter.lua
@ -1,20 +0,0 @@
-return {
-	"KDesp73/project-starter.nvim",
-	enabled = false,
-	cmd = { "CreateProject" },
-	config = function()
-		local home_dir = os.getenv("HOME")
-		require("project-starter").setup({
-			default_paths = {
-				-- c = "path/to/c/projects/",
-				cpp = home_dir .. "/Templates/cpp",
-				-- java = "path/to/java/projects/", -- this includes java swing projects
-				-- nvim_plugins = "path/to/neovim/plugins",
-				python = home_dir .. "/Templates/python/",
-				-- ruby = "path/to/ruby/projects",
-				-- android = "path/to/android/projects",
-			},
-			cd = true, -- change project directory after creation (default is true)
-		})
-	end,
-}
--- a/lua/plugins/py-requirements.lua
+++ b/lua/plugins/py-requirements.lua
@ -1,42 +0,0 @@
-return {
-	"MeanderingProgrammer/py-requirements.nvim",
-	dependencies = { "nvim-treesitter/nvim-treesitter" },
-	enabled = false,
-	opts = {
-		-- Enabled by default if you do not use `nvim-cmp` set to false
-		enable_cmp = true,
-		-- Endpoint used for getting package versions
-		index_url = "https://pypi.org/simple/",
-		-- Fallback endpoint in case 'index_url' fails to find a package
-		extra_index_url = nil,
-		-- Specify which file patterns plugin is active on
-		-- For info on patterns, see :h pattern
-		file_patterns = {
-			"requirements.txt",
-			"requirements.lock",
-			"requirements-dev.txt",
-			"requirements-dev.lock",
-			"requirements_dev.txt",
-		},
-		-- For available options, see :h vim.lsp.util.open_floating_preview
-		float_opts = { border = "rounded" },
-		filter = {
-			-- If set to true pull only final release versions, this will ignore alpha,
-			-- beta, release candidate, post release, and developmental release versions
-			final_release = false,
-			-- If set to true (default value) filter out yanked package versions
-			yanked = true,
-		},
-		-- Query to get each module present in a file
-		requirement_query = "(requirement) @requirement",
-		-- Query to get information out of each module
-		module_query = [[
-        (requirement (package) @name)
-        (version_spec (version_cmp) @cmp)
-        (version_spec (version) @version)
-    ]],
-	},
-	config = function(_, opts)
-		require("py-requirements").setup(opts)
-	end,
-}
--- a/lua/plugins/pymple.lua
+++ b/lua/plugins/pymple.lua
@ -3,13 +3,8 @@ return {
 	dependencies = {
 		"nvim-lua/plenary.nvim",
 		"MunifTanjim/nui.nvim",
-		-- "stevearc/dressing.nvim",
-		"nvim-tree/nvim-web-devicons",
 	},
 	build = ":PympleBuild",
-	config = function()
-		require("pymple").setup()
-	end,
 	opts = {
 		-- automatically register the following keymaps on plugin setup
 		keymaps = {
@ -18,8 +13,11 @@ return {
 			-- the top of the file (below any existing doctsring)
 			resolve_import_under_cursor = {
 				desc = "Resolve import under cursor",
-				keys = "<leader>li", -- feel free to change this to whatever you like
+				keys = "<leader>li",
 			},
 		},
 	},
+	config = function(_, opts)
+		require("pymple").setup(opts)
+	end,
 }
--- a/lua/plugins/rainbow-csv.lua
+++ b/lua/plugins/rainbow-csv.lua
@ -1,19 +0,0 @@
-return {
-	"cameron-wags/rainbow_csv.nvim",
-	ft = {
-		"csv",
-		"tsv",
-		"csv_semicolon",
-		"csv_whitespace",
-		"csv_pipe",
-		"rfc_csv",
-		"rfc_semicolon",
-	},
-	cmd = {
-		"RainbowDelim",
-		"RainbowDelimSimple",
-		"RainbowDelimQuoted",
-		"RainbowMultiDelim",
-	},
-	opts = true,
-}
--- a/lua/plugins/rittli.lua
+++ b/lua/plugins/rittli.lua
@ -1,9 +0,0 @@
-return {
-	-- https://github.com/miroshQa/rittli.nvim
-	"miroshQa/rittli.nvim",
-	enabled = false,
-	lazy = true,
-	dependencies = {
-		"nvim-telescope/telescope.nvim",
-	},
-}
--- a/lua/plugins/runner.lua
+++ b/lua/plugins/runner.lua
@ -1,55 +0,0 @@
-return {
-	"MarcHamamji/runner.nvim",
-	dependencies = {
-		"nvim-telescope/telescope.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
-	},
-	config = function()
-		local runner = require("runner")
-		local choice = require("runner.handlers.helpers").choice
-		local helpers = require("runner.handlers.helpers")
-
-		runner.setup({
-			position = "right", -- position of the terminal window when using the shell_handler
-			-- can be: top, left, right, bottom
-			-- will be overwritten when using the telescope mapping to open horizontally or vertically
-			width = 50, -- width of window when position is left or right
-			height = 10, -- height of window when position is top or bottom
-		})
-
-		runner.set_handler(
-			"cpp",
-			choice({
-				Cmake = function()
-					-- vim.cmd.CMakeBuild()
-					vim.cmd.CMakeRun()
-				end,
-				Makefile = helpers.shell_handler("make"),
-				["g++"] = helpers.shell_handler(
-					"g++ " .. vim.fn.expand("%") .. " -o " .. vim.fn.expand("%:r") .. " && " .. vim.fn.expand("%:r")
-				),
-				Custom = helpers.shell_handler("", true),
-			})
-		)
-
-		runner.set_handler(
-			"c",
-			choice({
-				Cmake = vim.cmd.CMakeRun,
-				Makefile = helpers.shell_handler("make"),
-				["gcc"] = helpers.shell_handler(
-					"gcc " .. vim.fn.expand("%") .. " -o " .. vim.fn.expand("%:r") .. " && " .. vim.fn.expand("%:r")
-				),
-				Custom = helpers.shell_handler("", true),
-			})
-		)
-
-		-- runner.set_handler(
-		-- 	"python",
-		-- 	choice({
-		-- 		Python = helpers.shell_handler("python " .. vim.fn.expand("%:t")),
-		-- 		Custom = helpers.shell_handler("", true),
-		-- 	})
-		-- )
-	end,
-}
--- a/lua/plugins/startuptime.lua
+++ b/lua/plugins/startuptime.lua
@ -1,4 +0,0 @@
-return {
-	"dstein64/vim-startuptime",
-	cmd = "StartupTime",
-}
--- a/lua/plugins/supermaven.lua
+++ b/lua/plugins/supermaven.lua
@ -1,22 +0,0 @@
-return {
-	"supermaven-inc/supermaven-nvim",
-	enabled = false,
-	opts = {
-		keymaps = {
-			accept_suggestion = "<Tab>",
-			clear_suggestion = "<C-]>",
-			accept_word = "<C-j>",
-		},
-		ignore_filetypes = {}, -- or { "cpp", }
-		color = {
-			suggestion_color = "#ffffff",
-			cterm = 244,
-		},
-		log_level = "info", -- set to "off" to disable logging completely
-		disable_inline_completion = true, -- disables inline completion for use with cmp
-		disable_keymaps = true, -- disables built in keymaps for more manual control
-		condition = function()
-			return false
-		end, -- condition to check for stopping supermaven, `true` means to stop supermaven when the condition is true.
-	},
-}
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@ -13,8 +13,7 @@ return {
 		{ "crispgm/telescope-heading.nvim" },
 		{ "benfowler/telescope-luasnip.nvim" },
 		{ "paopaol/telescope-git-diffs.nvim" },
-		{ "ThePrimeagen/harpoon", branch = "harpoon2" },
-		{ "ThePrimeagen/git-worktree.nvim" },
+		{ "ThePrimeagen/harpoon",                     branch = "harpoon2" },
 		{ "piersolenski/telescope-import.nvim" },
 		{ "nvim-telescope/telescope-frecency.nvim" },
 	},
@ -38,20 +37,20 @@ return {
 			end,
 			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>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>pm",
 			function()
@ -92,20 +91,6 @@ return {
 			"<cmd>Telescope software-licenses find<cr>",
 			desc = "[S]oftware Licenses",
 		},
-		{
-			"<leader>gw",
-			function()
-				require("telescope").extensions.git_worktree.git_worktrees()
-			end,
-			desc = "[G]it Change [W]orktree",
-		},
-		{
-			"<leader>gn",
-			function()
-				require("telescope").extensions.git_worktree.create_git_worktree()
-			end,
-			desc = "[G]it Create [N]ew Worktree",
-		},
 		{
 			"<leader>pD",
 			function()
@ -160,7 +145,7 @@ return {
 		},
 		extensions = {
 			fzf = {
-				fuzzy = true, -- false will only do exact matching
+				fuzzy = true,       -- false will only do exact matching
 				override_generic_sorter = true, -- override the generic sorter
 				override_file_sorter = true, -- override the file sorter
 				case_mode = "smart_case", -- or "ignore_case" or "respect_case"
@ -290,13 +275,12 @@ return {

 		pcall(telescope.load_extension, "fzf")
 		pcall(telescope.load_extension, "media_files") -- Telescope media_files
-		pcall(telescope.load_extension, "git_worktree") -- Telescope git_worktree
-		pcall(telescope.load_extension, "lazy") -- Telescope lazy
+		pcall(telescope.load_extension, "lazy")        -- Telescope lazy
 		pcall(telescope.load_extension, "software-licenses") -- Telescope software-licenses list
-		pcall(telescope.load_extension, "heading") -- Telescope heading
-		pcall(telescope.load_extension, "luasnip") -- Telescope luasnip
-		pcall(telescope.load_extension, "git_diffs") -- Telescope git_diffs diff_commits
-		pcall(telescope.load_extension, "bibtex") -- Telescope bibtex
+		pcall(telescope.load_extension, "heading")     -- Telescope heading
+		pcall(telescope.load_extension, "luasnip")     -- Telescope luasnip
+		pcall(telescope.load_extension, "git_diffs")   -- Telescope git_diffs diff_commits
+		pcall(telescope.load_extension, "bibtex")      -- Telescope bibtex
 		pcall(telescope.load_extension, "harpoon")
 		pcall(telescope.load_extension, "frecency")
 	end,
--- a/lua/plugins/timber.lua
+++ b/lua/plugins/timber.lua
@ -0,0 +1,26 @@
+-- Action						Keymap		Description
+-- insert_log_below				glj			Insert a log statement below the cursor
+-- insert_log_above				glk			Insert a log statement above the cursor
+-- insert_plain_log_below		glo			Insert a plain log statement below the cursor
+-- insert_plain_log_above		gl<S-o> 	Insert a plain log statement above the cursor
+-- add_log_targets_to_batch 	gla			Add a log target to the batch
+-- insert_batch_log				glb			Insert a batch log statement
+return {
+	"Goose97/timber.nvim",
+	version = "*",
+	event = "VeryLazy",
+	dependencies = {
+		"nvim-treesitter/nvim-treesitter",
+		"nvim-telescope/telescope.nvim",
+	},
+	opts = {
+		log_templates = {
+			default = {
+				python = [[logger.debug(f"{%log_target=}")]],
+			},
+		},
+	},
+	config = function(_, opts)
+		require("timber").setup(opts)
+	end,
+}
--- a/lua/plugins/typescript-tools.lua
+++ b/lua/plugins/typescript-tools.lua
@ -1,6 +1,5 @@
 return {
 	{
-
 		"pmizio/typescript-tools.nvim",
 		dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
 		ft = { "javascriptreact", "typescriptreact", "javascript", "typescript" },
@ -73,4 +72,10 @@ return {
 		"dmmulroy/ts-error-translator.nvim",
 		ft = { "javascriptreact", "typescriptreact", "javascript", "typescript" },
 	},
+	{
+		"folke/ts-comments.nvim",
+		opts = {},
+		event = "VeryLazy",
+		enabled = vim.fn.has("nvim-0.10.0") == 1,
+	},
 }
--- a/lua/plugins/web-devicons.lua
+++ b/lua/plugins/web-devicons.lua
@ -1 +0,0 @@
-return { "nvim-tree/nvim-web-devicons" }
--- a/lua/plugins/worktree.lua
+++ b/lua/plugins/worktree.lua
@ -1,11 +0,0 @@
-return {
-	"ThePrimeagen/git-worktree.nvim",
-	config = function()
-		local worktree = require("git-worktree")
-		worktree.on_tree_change(function(op, metadata)
-			if op == worktree.Operations.Switch then
-				print("Switched from " .. metadata.prev_path .. " to " .. metadata.path)
-			end
-		end)
-	end,
-}