diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index de4997d8..9b400511 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "c433ea7aa842c446edc2b1570998bf5440c68188" }, "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "SchemaStore.nvim": { "branch": "main", "commit": "85009f1efcea501d40fb7f575319516d5f93feaf" }, + "SchemaStore.nvim": { "branch": "main", "commit": "11d661ae5e08f19b5256661a6491a66fa26cdcfc" }, "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, @@ -19,14 +19,14 @@ "codeium.vim": { "branch": "main", "commit": "04e5f9dfb11d3bbcc28b4685378c1e6d2963fd1e" }, "comment-box.nvim": { "branch": "main", "commit": "6394c872257bdbf60ae31aa6096c4b86b6f4b844" }, "compiler.nvim": { "branch": "main", "commit": "4a44a63b2d5bad828d1a29a28a2a9a04119e01a8" }, - "conform.nvim": { "branch": "master", "commit": "d99b75b4aedf0e912f41c5740a7267de739cddac" }, + "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" }, "crates.nvim": { "branch": "main", "commit": "f2a169840e97a8ed2048abb507d2742c3895c85b" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dooku.nvim": { "branch": "main", "commit": "632ac0e27a96e77d8be47c42583fb58c3be9d85f" }, - "dressing.nvim": { "branch": "master", "commit": "0e88293ce3459f4bb310125f3366304af6dc7990" }, + "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, "dropbar.nvim": { "branch": "master", "commit": "9a8e498374276dd0281736c75b42098ef9fb5622" }, "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, @@ -53,7 +53,7 @@ "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, - "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, "mini.ai": { "branch": "main", "commit": "13a9074677e725e9ed230f860126db624b690dfc" }, "mini.align": { "branch": "main", "commit": "708c0265b1513a00c83c181bff3d237741031cd1" }, @@ -64,7 +64,7 @@ "multicursors.nvim": { "branch": "main", "commit": "8e876fe9db46c1b76c151202b418df21eca07bad" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "2f2d08894bbc679d4d181604c16bb7079f646384" }, "neoconf.nvim": { "branch": "main", "commit": "bf04719b3b25ba5f6a059c0a10ee67e5996bdc4c" }, - "neodev.nvim": { "branch": "main", "commit": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09" }, + "neodev.nvim": { "branch": "main", "commit": "a69b4c417b7e5bdeee3d181b8ff8dbc5de66fc01" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "neotest": { "branch": "master", "commit": "73043d666780e35185a77589e01bec96a52db910" }, "neotest-bash": { "branch": "main", "commit": "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb" }, @@ -90,7 +90,7 @@ "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, "nvim-lint": { "branch": "master", "commit": "8e5920f9ce9f24c283a2e64be5fe58d1d37d1744" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, - "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, + "nvim-lspconfig": { "branch": "master", "commit": "021906284dcfb938bc236f8295af2650c60cb807" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-origami": { "branch": "main", "commit": "4ec426ce4b0aad0303af44909f86e075dd65c615" }, @@ -99,7 +99,7 @@ "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" }, "nvim-scissors": { "branch": "main", "commit": "6f928de59253c270d7f6b58bb49c9322cebfcdbe" }, "nvim-spectre": { "branch": "master", "commit": "d958cc3ea8b3fb2f0922dff6177630a40751a3a9" }, - "nvim-treesitter": { "branch": "master", "commit": "6f586875e35e2b02358efa467317634c766fd1d4" }, + "nvim-treesitter": { "branch": "master", "commit": "4ea1a4ffa841acd8f1d51a7003f0cc9596ad8b64" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, @@ -107,7 +107,7 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, "nvim-various-textobjs": { "branch": "main", "commit": "ca9e6f290c25f6a3168c5dd64b9ef0a8000263d9" }, - "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" }, + "nvim-web-devicons": { "branch": "master", "commit": "7fd8d7f08be824d9d362fb2d9800b84eb15786c1" }, "nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" }, "octo.nvim": { "branch": "master", "commit": "f77d214e5a67f1c1eb601a9c99418a5f7924af22" }, "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" }, @@ -120,8 +120,8 @@ "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, - "py-requirements.nvim": { "branch": "main", "commit": "1cfdd53cf80398c577a66e717079b04990d6d206" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "8908741c5039fd337594448c0088459450277aef" }, + "py-requirements.nvim": { "branch": "main", "commit": "826f21563d63123cfb068e39b74ed73b6aa3256c" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "c84eeb689e4cc86808e823c11eac4239c75292ce" }, "refactoring.nvim": { "branch": "master", "commit": "aff2e21e2f1a19d302adceb4e7d0fafbb3ae59a9" }, "rest.nvim": { "branch": "main", "commit": "2d7bd3d398940ce2692941e6cd052c072207b9f9" }, "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, diff --git a/config/nvim/lua/plugins/extras/editor/py-requirements.lua b/config/nvim/lua/plugins/extras/editor/py-requirements.lua index c1d1ef56..958fde6b 100644 --- a/config/nvim/lua/plugins/extras/editor/py-requirements.lua +++ b/config/nvim/lua/plugins/extras/editor/py-requirements.lua @@ -1,20 +1,24 @@ return { - "hrsh7th/nvim-cmp", - dependencies = { - "MeanderingProgrammer/py-requirements.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - }, - opts = function() - require("py-requirements").setup({}) - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "requirements", - }, - }) - end, + "MeanderingProgrammer/py-requirements.nvim", + event = { + "BufRead requirements.txt", }, - opts = function(_, opts) - table.insert(opts.sources, { name = "py-requirements" }) + dependencies = { + { "nvim-lua/plenary.nvim" }, + { + "hrsh7th/nvim-cmp", + dependencies = {}, + opts = function(_, opts) + table.insert(opts.sources, { name = "py-requirements" }) + end, + }, + }, + opts = function() + require("py-requirements").setup({}) + require("nvim-treesitter.configs").setup({ + ensure_installed = { + "requirements", + }, + }) end, } diff --git a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua index ca3a4669..6767e802 100644 --- a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua @@ -22,10 +22,13 @@ local inlayHints = { } local function denoConfigExists() - local root = require("lazyvim.util.root").get() .. "/deno.json" + local configs = { "deno.json", "deno.jsonc" } + local root = require("lazyvim.util.root").get() - if vim.fn.filereadable(root) == 1 then - return true + for _, config in ipairs(configs) do + if vim.fn.filereadable(root .. "/" .. config) == 1 then + return true + end end return false @@ -77,9 +80,7 @@ return { }, }, }, - denols = { - root_dir = require("lspconfig").util.root_pattern("deno.json", "deno.jsonc", "deno.lock"), - }, + denols = {}, }, setup = { tsserver = function(_, opts) diff --git a/config/nvim/lua/plugins/extras/linting/biome.lua b/config/nvim/lua/plugins/extras/linting/biome.lua index aa0d82f5..72af89c5 100644 --- a/config/nvim/lua/plugins/extras/linting/biome.lua +++ b/config/nvim/lua/plugins/extras/linting/biome.lua @@ -10,10 +10,7 @@ return { "neovim/nvim-lspconfig", opts = { servers = { - biome = { - root_dir = require("lspconfig").util.root_pattern("biome.json"), - single_file_support = false, - }, + biome = {}, }, }, }, @@ -40,7 +37,6 @@ return { }) opts.formatters = { - cwd = require("conform.util").root_file({ "biome.json" }), biome = { condition = function(self, ctx) return vim.fs.find({ "biome.json" }, { path = ctx.filename, upward = true })[1] diff --git a/config/nvim/lua/plugins/extras/ui/zen-mode.lua b/config/nvim/lua/plugins/extras/ui/zen-mode.lua index 9405c863..50bc331e 100644 --- a/config/nvim/lua/plugins/extras/ui/zen-mode.lua +++ b/config/nvim/lua/plugins/extras/ui/zen-mode.lua @@ -17,6 +17,7 @@ return { executeCommandIfExists(":ScrollViewDisable") executeCommandIfExists(":LspLensOff") executeCommandIfExists(":NvimContextVtDisable") + executeCommandIfExists(":IBLDisable") Util.toggle.inlay_hints() executeCommandIfExists(":Gitsigns toggle_current_line_blame") end, @@ -26,6 +27,7 @@ return { executeCommandIfExists(":ScrollViewEnable") executeCommandIfExists(":LspLensOn") executeCommandIfExists(":NvimContextVtEnable") + executeCommandIfExists(":IBLEnable") Util.toggle.inlay_hints() executeCommandIfExists(":Gitsigns toggle_current_line_blame") end,