diff --git a/lazy-lock.json b/lazy-lock.json index 2e0d752..d443448 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,6 @@ { - "LazyVim": { "branch": "main", "commit": "ad3e2b635401fbc575cdbefea73ade477320da2f" }, + "CopilotChat.nvim": { "branch": "canary", "commit": "76bfba5cd8915ff55554e0649809bec0207b6a83" }, + "LazyVim": { "branch": "main", "commit": "bb289f4345835d98df7d0dfd4a26fd0dffa7e89a" }, "LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" }, "SchemaStore.nvim": { "branch": "main", "commit": "8ae7ed5b8a58ad36136d9b440205cef552bd0e41" }, "advanced-git-search.nvim": { "branch": "main", "commit": "1c5a10f5c838cfad2c17d7464311d6fb416cb319" }, @@ -42,7 +43,6 @@ "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" }, "mini.files": { "branch": "main", "commit": "6abe854f1410fc6aec69897a78b1db994c32d9c6" }, @@ -54,22 +54,20 @@ "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" }, "neotest-golang": { "branch": "main", "commit": "df6e3f34ae65f2520db798481a9d3f97581899b7" }, "neotest-java": { "branch": "main", "commit": "e1371c1e9a09632bfaa7fbb5e8166e6f1d38201d" }, - "noice.nvim": { "branch": "main", "commit": "ca2e3fea9fb080dcb79d9129d73dac631294fe79" }, + "noice.nvim": { "branch": "main", "commit": "6e0c8dcc61282782ac7fa4b9b4b0c910fd3f83d9" }, "none-ls.nvim": { "branch": "main", "commit": "fb7acad9e98ad9c617775451c1aea95157e17942" }, "notifier.nvim": { "branch": "master", "commit": "eea2d368ffd1b527e6f0c454c2cd907fd63420d8" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, - "nvim-dap": { "branch": "master", "commit": "6bf4de67dbe90271608e1c81797e5edc79ec6335" }, + "nvim-dap": { "branch": "master", "commit": "29d1f8814fa4fcc194ec574de998a42a22ebbe4a" }, "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, - "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, "nvim-jdtls": { "branch": "master", "commit": "c4279b8ffce9b64eb302056d78dfebc2968a49bc" }, "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" }, "nvim-lspconfig": { "branch": "master", "commit": "bc6ada4b0892b7f10852c0b8ca7209fd39a6d754" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" }, - "nvim-treesitter": { "branch": "master", "commit": "6389ceb1758b8f62a15194e3b790e33268304cb8" }, + "nvim-treesitter": { "branch": "master", "commit": "13c7caf8a602488b37cdefe8543c4cfdd5947d9d" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index d38d2b5..faf7a9a 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -20,7 +20,7 @@ require("lazy").setup { { import = "lazyvim.plugins.extras.coding.mini-surround" }, { import = "lazyvim.plugins.extras.formatting.prettier" }, - { import = "lazyvim.plugins.extras.dap.core" }, + -- { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.dap.nlua" }, { import = "lazyvim.plugins.extras.test.core" }, { import = "lazyvim.plugins.extras.lang.docker" }, diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua index 5a1aa87..79e7201 100644 --- a/lua/plugins/java.lua +++ b/lua/plugins/java.lua @@ -58,8 +58,10 @@ return { end, -- These depend on nvim-dap, but can additionally be disabled by setting false here. - dap = { hotcodereplace = "auto", config_overrides = {} }, - dap_main = {}, + dap = false, + -- dap = { hotcodereplace = "auto", config_overrides = {} }, + dap_main = false, + -- dap_main = {}, test = true, settings = { java = { @@ -141,47 +143,6 @@ return { }, } - -- if opts.dap and LazyVim.has "nvim-dap" and mason_registry.is_installed "java-debug-adapter" then - -- -- custom init for Java debugger - -- require("jdtls").setup_dap(opts.dap) - -- require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main) - -- - -- -- Java Test require Java debugger to work - -- if opts.test and mason_registry.is_installed "java-test" then - -- -- custom keymaps for Java test runner (not yet compatible with neotest) - -- wk.add { - -- { - -- mode = "n", - -- buffer = args.buf, - -- { "t", group = "test" }, - -- { - -- "tt", - -- function() - -- require("jdtls.dap").test_class { - -- config_overrides = type(opts.test) ~= "boolean" - -- and opts.test.config_overrides - -- or nil, - -- } - -- end, - -- desc = "Run All Test", - -- }, - -- { - -- "tr", - -- function() - -- require("jdtls.dap").test_nearest_method { - -- config_overrides = type(opts.test) ~= "boolean" - -- and opts.test.config_overrides - -- or nil, - -- } - -- end, - -- desc = "Run Nearest Test", - -- }, - -- { "tT", require("jdtls.dap").pick_test, desc = "Run Test" }, - -- }, - -- } - -- end - -- end - -- User can set additional keymaps in opts.on_attach if opts.on_attach then opts.on_attach(args) diff --git a/lua/plugins/lsp-html.lua b/lua/plugins/lsp-html.lua deleted file mode 100644 index 77a5f36..0000000 --- a/lua/plugins/lsp-html.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { - "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "html-lsp" }) - end, - }, -} diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index 1e57d3e..6f7e2bd 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -1,4 +1,14 @@ return { - "mason.nvim", - enabled = false, + { + "mason.nvim", + enabled = false, + }, + { + "mason-nvim-dap.nvim", + enabled = false, + }, + { + "mason-lspconfig.nvim", + enabled = false, + }, } diff --git a/lua/plugins/protobuf.lua b/lua/plugins/protobuf.lua index 9e48c9a..63d20dd 100644 --- a/lua/plugins/protobuf.lua +++ b/lua/plugins/protobuf.lua @@ -1,15 +1,8 @@ return { - { - "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "buf", "buf-language-server" }) - end, - }, { "nvimtools/none-ls.nvim", opts = function(_, opts) - local nls = require("null-ls") + local nls = require "null-ls" opts.sources = vim.list_extend(opts.sources or {}, { nls.builtins.diagnostics.buf, nls.builtins.formatting.buf,