Update 2024-05-24

after/ftplugin/rust.lua

@@ -1,18 +0,0 @@
-local bufnr = vim.api.nvim_get_current_buf()
-local opts = { silent = true, buffer = bufnr }
-local nmap = require("solo.mappings").nmap
-
--- nmap("<leader>a", function()
--- 	vim.cmd.RustLsp("codeAction")
--- end)
-
-nmap("<leader>re", vim.cmd.RustExpandMacro, "[E]xpand macro")
-nmap("<leader>rc", vim.cmd.RustOpenCargo, "Open [C]argo.toml")
-nmap("<leader>rp", vim.cmd.RustParentModule, "[P]arent module")
-nmap("<leader>rh", vim.cmd.RustHoverActions, "[H]over actions")
-nmap("<leader>rg", vim.cmd.RustViewCrateGraph, "View Create [G]raph")
-nmap("<leader>rd", vim.cmd.RustOpenExternalDocs, "Open External [D]ocs")
-nmap("<leader>rr", vim.cmd.RustRunnables, "Open [R]unnables")
-nmap("<leader>ra", vim.cmd.RustCodeAction, "Code [A]ction Groups")
-nmap("<leader>rD", vim.cmd.RustDebuggables, "[D]ebug")
-nmap("<leader>drd", vim.cmd.RustDebuggables, "[D]ebug")

lazy-lock.json

@@ -1,11 +1,11 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
   "ccc.nvim": { "branch": "main", "commit": "f388f1981d222967c741fe9927edf9ba5fa3bcbe" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
   "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "f36d788f05cfb73d4fd2e606e6ad15f8b842124f" },
   "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" },
   "cmake-tools.nvim": { "branch": "master", "commit": "d84e9ec2b71f18a39e8d8c4301796c77d64b80ef" },
   "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
@@ -23,22 +23,23 @@
   "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
   "crates.nvim": { "branch": "main", "commit": "8437522d12a8c523da2aee9db2979d070b2ecc33" },
   "darkplus.nvim": { "branch": "master", "commit": "75548e02e34ee21e8bdef1739f96f19125160000" },
-  "diffview.nvim": { "branch": "main", "commit": "0bae1a371ac68be86ead374ee2c4f36bd96bb6c6" },
+  "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" },
   "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" },
   "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
-  "garbage-day.nvim": { "branch": "main", "commit": "dcadabd7e5f371c827d59d84b7fd63d9893370ac" },
+  "garbage-day.nvim": { "branch": "main", "commit": "3af496f0d1dc6586dcf4ceda6bbf61a8f820ab66" },
   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
   "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" },
   "gitpad.nvim": { "branch": "main", "commit": "0c06ade8876fac93369183341d6d7125b859071b" },
-  "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
+  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
   "gruvbox.nvim": { "branch": "main", "commit": "96a8ec336fb48a11cefbd57508888361431aac26" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "harpoon-lualine": { "branch": "master", "commit": "d1b873c19b701fd80d60a67d086dbb3bcc4eb00e" },
   "hlargs.nvim": { "branch": "main", "commit": "30fe1b3de2b7614f061be4fc9c71984a2b87e50a" },
   "hypersonic.nvim": { "branch": "main", "commit": "aee42425b24a92febc46a42a9cabebe5f96f021b" },
   "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" },
+  "inlay-hints.nvim": { "branch": "master", "commit": "4392568b55819149fa94b640326df8d936687394" },
   "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" },
-  "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
+  "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" },
   "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "luarocks.nvim": { "branch": "main", "commit": "d3dda396d66e484590f253d1ac6d8980e3130807" },
@@ -49,45 +50,48 @@
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
   "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
   "melange-nvim": { "branch": "master", "commit": "5feb4a08876b81ccb61cae1adaffa2e737124922" },
-  "neoconf.nvim": { "branch": "main", "commit": "9092129e9a42ae26375001bd2e6118f8d57c7f2a" },
+  "neoconf.nvim": { "branch": "main", "commit": "d321ba056f06e079da99924b948a45dfbacdfba9" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
   "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" },
   "neorg": { "branch": "main", "commit": "f7c3fe69bea1f111ebd3dbd16e7b0f3f50a8cd8b" },
+  "neotest": { "branch": "master", "commit": "6f35d797882c6ce0ab7c87dc86561512dc3d7aba" },
+  "neotest-gtest": { "branch": "main", "commit": "081787a082abc0a14d53b3baff4aa5964045d204" },
+  "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" },
+  "neotest-vitest": { "branch": "main", "commit": "6965a714793d9d156dadbe734c99b3a307f65c61" },
   "neovim": { "branch": "main", "commit": "b6fe88c3282cf9f117a3e836d761c2d78d02f417" },
   "nightfly": { "branch": "master", "commit": "06c4ee680519f01ee6e61b891647feefc72da42e" },
   "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
   "nvim": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "nvim-cmp-rust": { "branch": "main", "commit": "1c431ba192a90da36194d8f2fcf14c4ec5afb4a5" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
-  "nvim-dap": { "branch": "master", "commit": "c65c163daa47e0623dd85d2303fce0c22e52ad01" },
+  "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" },
   "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
-  "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" },
+  "nvim-dap-ui": { "branch": "master", "commit": "71bfe9bd6b3465e169b53bea4f83775034d822dd" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
   "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" },
-  "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
+  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
   "nvim-silicon": { "branch": "main", "commit": "ab664633e5090809da7470288404fe5b8735a8c8" },
   "nvim-surround": { "branch": "main", "commit": "79aaa42da1f698ed31bcbe7f83081f69dca7ba17" },
-  "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" },
+  "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "55e29081e73d2e4b2d62fb4dc3eebe21bf66a1e2" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" },
   "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "cbab9ad88036915beebd13b47e100743ff2ed2d5" },
   "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
-  "octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" },
   "ohne-accidents": { "branch": "main", "commit": "f5ba799e64ef202aa45a8fd2731fa7c17c9912f7" },
-  "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" },
+  "oil.nvim": { "branch": "master", "commit": "06a19f77f1a1da37b675635e6f9c5b5d50bcaacd" },
   "onedark.nvim": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" },
   "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "5d0d30b201566ce1fe31415f41fe2a7bdf56f4a7" },
+  "py-requirements.nvim": { "branch": "main", "commit": "78021560d7115db083908a19185d50fd3ebfeb57" },
-  "rainbow_csv": { "branch": "master", "commit": "6b914b420fd390103d9d98b3d6a67648ebe59274" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "dd1156723eb8483e4403eb8765bbdff456b6981d" },
+  "rainbow_csv.nvim": { "branch": "main", "commit": "5033e3abd4fb0a0ee07232530a032296535704b4" },
   "runner.nvim": { "branch": "main", "commit": "fb699ec0545ba3cd9ab5167fc3d07831a836574b" },
-  "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
+  "rustaceanvim": { "branch": "master", "commit": "e306c742bd7f7183e371cd91268b72d9db1bbae0" },
   "tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" },
   "tailwind-fold.nvim": { "branch": "main", "commit": "4335dd915073fe3da43a85b06742d12626603973" },
   "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" },
@@ -101,9 +105,9 @@
   "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" },
   "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
   "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" },
-  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "telescope.nvim": { "branch": "master", "commit": "d829aa64059001ee7b2c8c8aa9c4e6df0b17d893" },
-  "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
+  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
-  "tokyonight.nvim": { "branch": "main", "commit": "b9b494fa7f7bbf2fe0747b47fa290fb7a4eddcc7" },
+  "tokyonight.nvim": { "branch": "main", "commit": "7fc18e82575f5b482b758b6dddfe97b606819a20" },
   "tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" },
   "treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" },
   "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
@@ -114,12 +118,13 @@
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
   "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
-  "vim-dadbod": { "branch": "master", "commit": "fb30422b7bee7e2fa4205a4d226f01477f4fc593" },
+  "vim-dadbod": { "branch": "master", "commit": "37523ffe0849b51db07fa7f48430c2aca5420a0e" },
   "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "5aa854ee6017e9a3463d3dc8eee5aac93739f021" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "c365064cd5bc625d1aebab6235d504bd91274cdb" },
   "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
   "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": "c600cf10db1bf933aab9e357158bf9b202ecf99b" },
   "vimtex": { "branch": "master", "commit": "9665df7f51ee24aa81dbd81782e0a22480209753" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },

lua/plugins/clang_extensions.lua

@@ -1,68 +0,0 @@
-return {
-	"p00f/clangd_extensions.nvim",
-	ft = { "cpp", "c" },
-	opts = {
-		inlay_hints = {
-			inline = vim.fn.has("nvim-0.10") == 1,
-			autoSetHints = false,
-			-- Options other than `highlight' and `priority' only work
-			-- if `inline' is disabled
-			-- Only show inlay hints for the current line
-			only_current_line = false,
-			-- Event which triggers a refresh of the inlay hints.
-			-- You can make this { "CursorMoved" } or { "CursorMoved,CursorMovedI" } but
-			-- not that this may cause  higher CPU usage.
-			-- This option is only respected when only_current_line and
-			-- autoSetHints both are true.
-			only_current_line_autocmd = { "CursorHold" },
-			-- whether to show parameter hints with the inlay hints or not
-			show_parameter_hints = true,
-			-- prefix for parameter hints
-			parameter_hints_prefix = "<- ",
-			-- prefix for all the other hints (type, chaining)
-			other_hints_prefix = "=> ",
-			-- whether to align to the length of the longest line in the file
-			max_len_align = true,
-			-- padding from the left if max_len_align is true
-			max_len_align_padding = 1,
-			-- whether to align to the extreme right or not
-			right_align = false,
-			-- padding from the right if right_align is true
-			right_align_padding = 8,
-			-- The color of the hints
-			highlight = "Comment",
-			-- The highlight group priority for extmark
-			priority = 100,
-		},
-		ast = {
-			role_icons = {
-				type = "",
-				declaration = "",
-				expression = "",
-				specifier = "",
-				statement = "",
-				["template argument"] = "",
-			},
-			kind_icons = {
-				Compound = "",
-				Recovery = "",
-				TranslationUnit = "",
-				PackExpansion = "",
-				TemplateTypeParm = "",
-				TemplateTemplateParm = "",
-				TemplateParamObject = "",
-			},
-			highlights = {
-				detail = "Comment",
-			},
-		},
-
-		memory_usage = {
-			border = "none",
-		},
-
-		symbol_info = {
-			border = "none",
-		},
-	},
-}

lua/plugins/cmp.lua

@@ -11,7 +11,7 @@ return {
 		{
 			"vrslev/cmp-pypi",
 			dependencies = { "nvim-lua/plenary.nvim" },
-			event = { "BufRead pyproject.toml", "BufRead requirements.txt", "BufRead requirements_dev.txt" },
+			event = { "BufRead pyproject.toml" },
 		},
 		{ "kristijanhusak/vim-dadbod-completion", dependencies = { "tpope/vim-dadbod" } },
 		"SergioRibera/cmp-dotenv",
@@ -21,12 +21,10 @@ return {
 		"Exafunction/codeium.nvim",
 		"petertriho/cmp-git",
 		"davidsierradz/cmp-conventionalcommits",
-		"ryo33/nvim-cmp-rust",
 	},
 	config = function()
 		local cmp = require("cmp")
 		local luasnip = require("luasnip")
-		local compare = require("cmp.config.compare")
 		local kind_icons = {
 			Text = "󰉿",
 			Method = "󰆧",
@@ -59,8 +57,8 @@ return {
 
 		cmp.setup({
 			mapping = {
-				["<C-p>"] = cmp.mapping.select_prev_item({behavior=cmp.SelectBehavior.Insert}),
+				["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-				["<C-n>"] = cmp.mapping.select_next_item({behavior=cmp.SelectBehavior.Insert}),
+				["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
 				["<C-d>"] = cmp.mapping.scroll_docs(-4),
 				["<C-u>"] = cmp.mapping.scroll_docs(4),
 				["<C-Space>"] = cmp.mapping.complete(),
@@ -129,36 +127,6 @@ return {
 				behavior = cmp.ConfirmBehavior.Replace,
 				select = false,
 			},
-			filetypes = {
-				sorting = {
-					priority_weight = 2,
-					comparators = {
-						-- deprioritize `.box`, `.mut`, etc.
-						require("cmp-rust").deprioritize_postfix,
-						-- deprioritize `Borrow::borrow` and `BorrowMut::borrow_mut`
-						require("cmp-rust").deprioritize_borrow,
-						-- deprioritize `Deref::deref` and `DerefMut::deref_mut`
-						require("cmp-rust").deprioritize_deref,
-						-- deprioritize `Into::into`, `Clone::clone`, etc.
-						require("cmp-rust").deprioritize_common_traits,
-						compare.offset,
-						compare.exact,
-						compare.score,
-						compare.recently_used,
-						compare.locality,
-						compare.sort_text,
-						compare.length,
-						compare.order,
-					},
-				},
-			},
 		})
-
-		--[[ cmp.setup.cmdline("/", {
-			mapping = cmp.mapping.preset.cmdline(),
-			sources = {
-				{ name = "buffer" },
-			},
-		}) ]]
 	end,
 }

lua/plugins/conform.lua

@@ -5,12 +5,10 @@ return {
 	cmd = { "ConformInfo" },
 	keys = {
 		{
-			-- Customize or remove this keymap to your liking
 			"<leader>f",
 			function()
 				require("conform").format({ async = true, lsp_fallback = true })
 			end,
-			mode = "",
 			desc = "[F]ormat buffer",
 		},
 	},

lua/plugins/crates.lua

@@ -139,9 +139,9 @@ return {
 				yanked = "  yanked ",
 			},
 		},
-		null_ls = {
+		--[[ null_ls = {
 			enabled = true,
 			name = "crates.nvim",
-		},
+		}, ]]
 	},
 }

lua/plugins/dap.lua

@@ -1,20 +1,14 @@
 return {
-	"jayp0521/mason-nvim-dap.nvim",
+	"mfussenegger/nvim-dap",
-	opts = {
-		ensure_installed = {
-			"python",
-			"codelldb",
-		},
-		automatic_install = true,
-	},
 	dependencies = {
+		"jayp0521/mason-nvim-dap.nvim",
 		"williamboman/mason.nvim",
-		{ "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } },
+		"rcarriga/nvim-dap-ui",
 		"mfussenegger/nvim-dap",
 		-- { "simrat39/rust-tools.nvim", ft = "rust" },
+		"nvim-neotest/nvim-nio",
 		{ "mfussenegger/nvim-dap-python", ft = "python" },
 		"theHamsta/nvim-dap-virtual-text",
-		"williamboman/mason.nvim",
 	},
 	keys = {
 		{
@@ -132,33 +126,47 @@ return {
 			desc = "[S]copes",
 		},
 		{
-			"<F5>",
+			"<F1>",
 			function()
 				require("dap").continue()
 			end,
 			desc = "DAP Continue",
 		},
 		{
-			"<F10>",
+			"<F2>",
-			function()
-				require("dap").step_over()
-			end,
-			desc = "DAP Step Over",
-		},
-		{
-			"<F11>",
 			function()
 				require("dap").step_into()
 			end,
 			desc = "DAP Step Into",
 		},
 		{
-			"<F12>",
+			"<F3>",
+			function()
+				require("dap").step_over()
+			end,
+			desc = "DAP Step Over",
+		},
+		{
+			"<F4>",
 			function()
 				require("dap").step_out()
 			end,
 			desc = "DAP Step Out",
 		},
+		{
+			"<F5>",
+			function()
+				require("dap").step_back()
+			end,
+			desc = "DAP Step Back",
+		},
+		{
+			"<F6>",
+			function()
+				require("dap").restart()
+			end,
+			desc = "DAP Restart",
+		},
 	},
 	config = function()
 		local dap = require("dap")
@@ -181,24 +189,20 @@ return {
 		local mason_registry = require("mason-registry")
 
 		dapui.setup()
+		require("mason-nvim-dap").setup({
+			ensure_installed = {
+				"python",
+			},
+			automatic_install = true,
+		})
+
 		require("nvim-dap-virtual-text").setup({})
+
 		-- Python
 		local debugpy = mason_registry.get_package("debugpy")
 		local debugpy_path = debugpy:get_install_path() .. "/venv/bin/python"
 		require("dap-python").setup(debugpy_path)
 
-		local codelldb = mason_registry.get_package("codelldb")
-		local codelldb_path = codelldb:get_install_path() .. "/codelldb"
-		local liblldb_path = codelldb:get_install_path() .. "/extension/lldb/lib/liblldb.so"
-
-		-- Rust
-		require("rust-tools").setup({
-			dap = {
-				adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path),
-			},
-		})
-		-- dap.configurations.rust = {}
-
 		-- C/C++
 		dap.adapters.gdb = {
 			type = "executable",

lua/plugins/inlay-hints.lua

@@ -1,8 +1,9 @@
 return {
 	"MysticalDevil/inlay-hints.nvim",
-	name = "inlay",
 	event = "LspAttach",
-	enabled = false,
 	dependencies = { "neovim/nvim-lspconfig" },
-	opts = {},
+	opts = {
+		commands = { enable = true }, -- Enable InlayHints commands, include `InlayHintsToggle`, `InlayHintsEnable` and `InlayHintsDisable`
+		autocmd = { enable = true }, -- Enable the inlay hints on `LspAttach` event
+	},
 }

lua/plugins/lsp/clangd.lua

@@ -4,7 +4,7 @@ M.setup = function(lsp, capabilities)
 	capabilities = capabilities
 	lsp.clangd.setup({
 		capabilities = capabilities,
-		--[[ settings = {
+		settings = {
 			clangd = {
 				InlayHints = {
 					Designators = true,
@@ -14,7 +14,7 @@ M.setup = function(lsp, capabilities)
 				},
 				fallbackFlags = { "-std=c++20" },
 			},
-		}, ]]
+		},
 	})
 end
 

lua/plugins/lsp/gopls.lua

@@ -0,0 +1,20 @@
+local M = {}
+
+M.setup = function(lsp, capabilities)
+	lsp.gopls.setup({
+		capabilities = capabilities,
+		settings = {
+			hints = {
+				rangeVariableTypes = true,
+				parameterNames = true,
+				constantValues = true,
+				assignVariableTypes = true,
+				compositeLiteralFields = true,
+				compositeLiteralTypes = true,
+				functionTypeParameters = true,
+			},
+		},
+	})
+end
+
+return M

lua/plugins/lsp/html.lua

@@ -0,0 +1,17 @@
+local M = {}
+
+M.setup = function(lsp, capabilities)
+	lsp.html.setup({
+		capabilities = capabilities,
+		filetypes = {
+			"html",
+			"htmldjango",
+			"templ",
+		},
+		init_options = {
+			provideFormatter = false,
+		},
+	})
+end
+
+return M

lua/plugins/lsp/tsserver.lua

@@ -1,35 +0,0 @@
-local M = {}
-
-M.setup = function(lsp, capabilities)
-	capabilities = capabilities
-	lsp.tsserver.setup({
-		ssettings = {
-			typescript = {
-				inlayHints = {
-					includeInlayParameterNameHints = "all",
-					includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-					includeInlayFunctionParameterTypeHints = true,
-					includeInlayVariableTypeHints = true,
-					includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-					includeInlayPropertyDeclarationTypeHints = true,
-					includeInlayFunctionLikeReturnTypeHints = true,
-					includeInlayEnumMemberValueHints = true,
-				},
-			},
-			javascript = {
-				inlayHints = {
-					includeInlayParameterNameHints = "all",
-					includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-					includeInlayFunctionParameterTypeHints = true,
-					includeInlayVariableTypeHints = true,
-					includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-					includeInlayPropertyDeclarationTypeHints = true,
-					includeInlayFunctionLikeReturnTypeHints = true,
-					includeInlayEnumMemberValueHints = true,
-				},
-			},
-		},
-	})
-end
-
-return M

lua/plugins/lspconfig.lua

@@ -14,6 +14,14 @@ return {
 		require("mason").setup()
 		local lsp = require("lspconfig")
 		local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
+		lsp_capabilities = vim.tbl_deep_extend("keep", lsp_capabilities, {
+			textDocument = {
+				foldingRange = {
+					dynamicRegistration = false,
+					lineFoldingOnly = true,
+				},
+			},
+		})
 
 		local default_setup = function(server)
 			lsp[server].setup({
@@ -113,7 +121,7 @@ return {
 			border = "rounded",
 		})
 		local html_opts = {
-			filetypes = { "html", "htmldjango" },
+			filetypes = { "html", "htmldjango", "templ" },
 		}
 
 		require("mason-lspconfig").setup({
@@ -131,20 +139,11 @@ return {
 				"lua_ls",
 				"tailwindcss",
 				"texlab",
-				"tsserver",
-				-- "rust_analyzer",
 			},
 			handlers = {
 				default_setup,
 				clangd = function()
 					lsp_capabilities.offsetEncoding = { "utf-16" }
-					vim.api.nvim_create_autocmd("LspAttach", {
-						desc = "enable inlay hints",
-						callback = function()
-							require("clangd_extensions.inlay_hints").setup_autocmd()
-							require("clangd_extensions.inlay_hints").set_inlay_hints()
-						end,
-					})
 					require("plugins.lsp.clangd").setup(lsp, lsp_capabilities)
 				end,
 				bashls = function()
@@ -172,24 +171,8 @@ return {
 					lsp.jinja_lsp.setup(html_opts)
 				end,
 				html = function()
-					lsp.html.setup(html_opts)
+					require("plugins.lsp.html").setup(lsp, lsp_capabilities)
 				end,
-				tsserver = function()
-					require("plugins.lsp.tsserver").setup(lsp, lsp_capabilities)
-				end,
-				--[[ eslint = function()
-					vim.api.nvim_create_autocmd("LspAttach", {
-						callback = function(client, bufnr)
-							vim.api.nvim_create_autocmd("BufWritePre", {
-								buffer = bufnr,
-								command = "EslintFixAll",
-							})
-						end,
-					})
-					lsp.eslint.setup({
-						capabilities = lsp_capabilities,
-					})
-				end, ]]
 			},
 		})
 	end,

lua/plugins/noetest.lua

@@ -0,0 +1,21 @@
+return {
+	"nvim-neotest/neotest",
+	dependencies = {
+		"nvim-neotest/nvim-nio",
+		"nvim-lua/plenary.nvim",
+		"antoinemadec/FixCursorHold.nvim",
+		"nvim-treesitter/nvim-treesitter",
+		"nvim-neotest/neotest-python",
+		"marilari88/neotest-vitest",
+		"mrcjkb/rustaceanvim",
+		"alfaix/neotest-gtest",
+	},
+	opts = {
+		adapters = {
+			["neotest-python"] = {},
+			["neotest-vitest"] = {},
+			["rustaceanvim.neotest"] = {},
+			["neotest-gtest"] = {},
+		},
+	},
+}

lua/plugins/octo.lua

@@ -1,9 +0,0 @@
-return {
-	"pwntester/octo.nvim",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"nvim-telescope/telescope.nvim",
-		"nvim-tree/nvim-web-devicons",
-	},
-	opts = {},
-}

lua/plugins/py-requirements.lua

@@ -0,0 +1,13 @@
+return {
+	"MeanderingProgrammer/py-requirements.nvim",
+	dependencies = { "nvim-lua/plenary.nvim" },
+	opts = {
+		enable_cmp = true,
+		file_patterns = { "requirements.txt", "requirements_dev.txt", "requirements-dev.txt" },
+		float_opts = { border = "rounded" },
+		filter = {
+			final_release = false,
+			yanked = true,
+		},
+	},
+}

lua/plugins/rainbow-csv.lua

@@ -0,0 +1,19 @@
+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,
+}

lua/plugins/rainbow-delimeters.lua

@@ -1,10 +1,11 @@
 return {
 	"HiPhish/rainbow-delimiters.nvim",
-	config = function()
+	opts = {
-		require("rainbow-delimiters.setup").setup({
+		strategy = {},
-			strategy = {},
+		query = {},
-			query = {},
+		highlight = {},
-			highlight = {},
+	},
-		})
+	config = function(_, opts)
+		require("rainbow-delimiters.setup").setup(opts)
 	end,
 }

lua/plugins/rust-tools.lua

@@ -2,6 +2,7 @@ return {
 	"simrat39/rust-tools.nvim",
 	dependencies = { "neovim/nvim-lspconfig" },
 	ft = "rust",
+	enabled = false,
 	opts = {
 		tools = {
 			-- on_initialized = nil,

lua/plugins/rustaceanvim.lua

@@ -1,48 +1,54 @@
 return {
 	"mrcjkb/rustaceanvim",
-	version = "^4", -- Recommended
+	version = "^4",
-	lazy = false, -- This plugin is already lazy
+	lazy = false,
-	enabled = false,
+	ft = { "rust" },
-	config = function()
+	opts = {
-		vim.g.rustaceanvim = {
+		tools = {},
-			server = {
+		server = {
-				settings = {
+			settings = {
-					["rust-analyzer"] = {
+				-- on_attach = function(client, bufnr)
-						inlayHints = {
+				-- 	-- you can also put keymaps in here
-							bindingModeHints = {
+				-- end,
-								enable = false,
+				["rust-analyzer"] = {
-							},
+					inlayHints = {
-							chainingHints = {
+						bindingModeHints = {
-								enable = true,
+							enable = false,
-							},
+						},
-							closingBraceHints = {
+						chainingHints = {
-								enable = true,
+							enable = true,
-								minLines = 25,
+						},
-							},
+						closingBraceHints = {
-							closureReturnTypeHints = {
+							enable = true,
-								enable = true,
+							minLines = 25,
-							},
+						},
-							lifetimeElisionHints = {
+						closureReturnTypeHints = {
-								enable = true,
+							enable = true,
-								useParameterNames = true,
+						},
-							},
+						lifetimeElisionHints = {
-							maxLength = 25,
+							enable = true,
-							parameterHints = {
+							useParameterNames = true,
-								enable = true,
+						},
-							},
+						maxLength = 25,
-							reborrowHints = {
+						parameterHints = {
-								enable = true,
+							enable = true,
-							},
+						},
-							renderColons = true,
+						reborrowHints = {
-							typeHints = {
+							enable = true,
-								enable = true,
+						},
-								hideClosureInitialization = true,
+						renderColons = true,
-								hideNamedConstructor = true,
+						typeHints = {
-							},
+							enable = true,
+							hideClosureInitialization = true,
+							hideNamedConstructor = true,
 						},
 					},
 				},
 			},
-		}
+		},
+		dap = {},
+	},
+	config = function(_, opts)
+		vim.g.rustaceanvim = opts
 	end,
 }

lua/plugins/startuptime.lua

@@ -0,0 +1,4 @@
+return {
+	"dstein64/vim-startuptime",
+	cmd = "StartupTime",
+}

lua/plugins/tailwind_tools.lua

@@ -1,22 +0,0 @@
-return {
-	"luckasRanarison/tailwind-tools.nvim",
-	dependencies = { "nvim-treesitter/nvim-treesitter" },
-	enabled = false,
-	ft = { "html" },
-	opts = {
-		document_color = {
-			enabled = true, -- can be toggled by commands
-			kind = "inline", -- "inline" | "foreground" | "background"
-			inline_symbol = "󰝤 ", -- only used in inline mode
-			debounce = 200, -- in milliseconds, only applied in insert mode
-		},
-		conceal = {
-			enabled = false, -- can be toggled by commands
-			symbol = "󱏿", -- only a single character is allowed
-			highlight = { -- extmark highlight options, see :h 'highlight'
-				fg = "#38BDF8",
-			},
-		},
-		custom_filetypes = {}, -- see the extension section to learn how it works
-	},
-}

lua/plugins/treesitter.lua

@@ -3,7 +3,6 @@ return {
 	build = ":TSUpdate",
 	dependencies = {
 		"nvim-treesitter/nvim-treesitter-context",
-		"mechatroner/rainbow_csv",
 		"JoosepAlviste/nvim-ts-context-commentstring",
 		"nvim-treesitter/nvim-treesitter-textobjects",
 		"luckasRanarison/tree-sitter-hyprlang",

lua/plugins/typescript-tools.lua

@@ -1,6 +1,7 @@
 return {
 	"pmizio/typescript-tools.nvim",
 	dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+	ft = { "javascriptreact", "typescriptreact", "javascript", "typescript" },
 	opts = {
 		handlers = {},
 		settings = {
@@ -12,13 +13,15 @@ return {
 			-- "remove_unused_imports"|"organize_imports") -- or string "all"
 			-- to include all supported code actions
 			-- specify commands exposed as code_actions
-			expose_as_code_action = {},
+			expose_as_code_action = "all",
 			-- string|nil - specify a custom path to `tsserver.js` file, if this is nil or file under path
 			-- not exists then standard path resolution strategy is applied
 			tsserver_path = nil,
 			-- specify a list of plugins to load by tsserver, e.g., for support `styled-components`
 			-- (see 💅 `styled-components` support section)
-			tsserver_plugins = {},
+			tsserver_plugins = {
+				"@styled/typescript-styled-plugin",
+			},
 			-- this value is passed to: https://nodejs.org/api/cli.html#--max-old-space-sizesize-in-megabytes
 			-- memory limit in megabytes or "auto"(basically no limit)
 			tsserver_max_memory = "auto",

lua/plugins/ufo.lua

@@ -0,0 +1,43 @@
+return {
+	"kevinhwang91/nvim-ufo",
+	dependencies = { "kevinhwang91/promise-async" },
+	enabled = false,
+	keys = {
+		{
+			"zR",
+			function()
+				require("ufo").openAllFolds()
+			end,
+			desc = "Open all folds",
+		},
+		{
+			"zM",
+			function()
+				require("ufo").closeAllFolds()
+			end,
+			desc = "Close all folds",
+		},
+		{
+			"zK",
+			function()
+				require("ufo").peekFoldedLinesUnderCursor()
+			end,
+			desc = "Peek fold",
+		},
+	},
+	opts = {
+		close_fold_kinds_for_ft = {
+			default = { "imports", "comment" },
+			json = { "array" },
+			c = { "comment", "region" },
+		},
+		preview = {
+			win_config = {
+				winblend = 0,
+			},
+		},
+		provider_selector = function(_, filetype, buftype)
+			return { "lsp", "treesitter" }
+		end,
+	},
+}

lua/solo/autocmds.lua

@@ -29,7 +29,7 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
 	end,
 })
 
-vim.api.nvim_create_autocmd({ "BufWritePre" }, {
+--[[ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
 	pattern = { "*.py" },
 	callback = function()
 		vim.lsp.buf.code_action({
@@ -39,7 +39,7 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
 			apply = true,
 		})
 	end,
-})
+}) ]]
 
 -- Center on InsertEnter
 vim.api.nvim_create_autocmd({ "InsertEnter" }, {
@@ -55,6 +55,13 @@ vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
 	end,
 })
 
+vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
+	pattern = "requirements*.txt",
+	callback = function()
+		vim.cmd("setf requirements")
+	end,
+})
+
 vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
 	pattern = "**/Codnity/**/*.html",
 	callback = function()

lua/solo/options.lua

@@ -11,6 +11,9 @@ vim.opt.expandtab = true -- convert tabs to spaces
 vim.opt.fileencoding = "utf-8" -- the encoding written to a file
 vim.opt.fillchars.eob = " "
 vim.opt.foldmethod = "manual"
+vim.opt.foldenable = true
+vim.opt.foldlevelstart = 99
+vim.opt.foldcolumn = "1" -- '0' is not bad
 vim.opt.guifont = "JetBrainsMono NF:h11" -- the font used in graphical neovim applications
 vim.opt.hlsearch = false -- highlight all matches on previous search pattern
 vim.opt.ignorecase = true -- ignore case in search patterns