diff --git a/lazy-lock.json b/lazy-lock.json index 0512ae9..319ba5b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -20,6 +20,7 @@ "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "8202df9561b90102b41dbc1ad71945534ef4ea39" }, "nvim-colorizer.lua": { "branch": "master", "commit": "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193" }, + "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, "nvim-lspconfig": { "branch": "master", "commit": "649137cbc53a044bffde36294ce3160cb18f32c7" }, "nvim-tree.lua": { "branch": "master", "commit": "78a9ca5ed6557f29cd0ce203df44213e54bfabb9" }, "nvim-treesitter": { "branch": "master", "commit": "17d7cf6f4b4057a949e86df6fbc2e271ba788823" }, diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index ee373cf..683da15 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -159,10 +159,10 @@ M.fugitive = { M.harpoon = { plugin = true, n = { - [""] = { function() require("harpoon.ui").nav_file(1) end, "Harpoon File 1" }, - [""] = { function() require("harpoon.ui").nav_file(2) end, "Harpoon File 2" }, - [""] = { function() require("harpoon.ui").nav_file(3) end, "Harpoon File 3" }, - [""] = { function() require("harpoon.ui").nav_file(4) end, "Harpoon File 4" }, + [""] = { function() require("harpoon.ui").nav_file(1) end, "Harpoon File 1" }, + [""] = { function() require("harpoon.ui").nav_file(2) end, "Harpoon File 2" }, + [""] = { function() require("harpoon.ui").nav_file(3) end, "Harpoon File 3" }, + [""] = { function() require("harpoon.ui").nav_file(4) end, "Harpoon File 4" }, [""] = { function() require("harpoon.ui").toggle_quick_menu() end, "Harpoon Toggle Quick Menu" }, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 4ffb9eb..3de1184 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -21,7 +21,8 @@ local plugins = { lazy = false, init = function() require("tokyonight").setup({ - transparent = true, + -- transparent = true, + style = "night" }) vim.cmd.colorscheme("tokyonight-night") end @@ -161,6 +162,19 @@ local plugins = { end }, + + { + "mfussenegger/nvim-jdtls", + ft = "java", + + config = function() + local config = { + cmd = { vim.fn.stdpath "data" .. "/mason/bin/jdtls" }, + root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]), + } + require('jdtls').start_or_attach(config) + end, + }, -- load luasnips + cmp related in insert mode only {