diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index fe4b2f6..7fec94b 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -12,10 +12,11 @@ require("lazy").setup({ { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here { import = "lazyvim.plugins.extras.lang.typescript" }, + { import = "lazyvim.plugins.extras.lang.java" }, { import = "lazyvim.plugins.extras.lang.json" }, -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, { import = "lazyvim.plugins.extras.dap.core" }, - { import = "lazyvim.plugins.extras.editor.flash" }, + -- { import = "lazyvim.plugins.extras.editor.flash" }, -- import/override with your plugins { import = "plugins" }, }, diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 869c1d5..18e55ac 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -2,91 +2,91 @@ return { { "jay-babu/mason-nvim-dap.nvim", tag = "v2.0.1" }, { "neovim/nvim-lspconfig", - dependencies = { - { "mfussenegger/nvim-jdtls" }, - }, + -- dependencies = { + -- { "mfussenegger/nvim-jdtls" }, + -- }, opts = { autoformat = false, - servers = { - jdtls = {}, - }, - setup = { - jdtls = function(_, opts) - vim.api.nvim_create_autocmd("Filetype", { - pattern = "java", -- autocmd to start jdtls - callback = function() - -- use this function notation to build some variables - local root_markers = { ".git", "mvnw", "gradlew", "pom.xml", "build.gradle" } - local root_dir = require("jdtls.setup").find_root(root_markers) - - -- calculate workspace dir - local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") - local workspace_dir = vim.fn.stdpath("data") .. "/site/java/workspace-root/" .. project_name - -- os.execute("mkdir " .. workspace_dir) - - -- get the mason install path - local install_path = require("mason-registry").get_package("jdtls"):get_install_path() - local debug_install_path = require("mason-registry").get_package("java-debug-adapter"):get_install_path() - local test_install_path = require("mason-registry").get_package("java-test"):get_install_path() - - -- get the current OS - local os - if vim.fn.has("macunix") then - os = "mac" - elseif vim.fn.has("win32") then - os = "win" - else - os = "linux" - end - - -- return the server config - local config = { - cmd = { - "java", - "-Declipse.application=org.eclipse.jdt.ls.core.id1", - "-Dosgi.bundles.defaultStartLevel=4", - "-Declipse.product=org.eclipse.jdt.ls.core.product", - "-Dlog.protocol=true", - "-Dlog.level=ALL", - -- "-javaagent:" .. install_path .. "/lombok.jar", - "-Xms1g", - "--add-modules=ALL-SYSTEM", - "--add-opens", - "java.base/java.util=ALL-UNNAMED", - "--add-opens", - "java.base/java.lang=ALL-UNNAMED", - "-jar", - vim.fn.glob(install_path .. "/plugins/org.eclipse.equinox.launcher_*.jar"), - "-configuration", - install_path .. "/config_" .. os, - "-data", - workspace_dir, - }, - root_dir = root_dir, - settings = { - java = { - referencesCodeLens = { - enabled = false, - }, - }, - }, - init_options = { - bundles = vim.list_extend({ - vim.fn.glob(debug_install_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", true), - }, vim.split(vim.fn.glob(test_install_path .. "/extension/server/*.jar", true), "\n")), - }, - ["on_attach"] = function(client, bufnr) - require("jdtls").setup_dap() - require("jdtls.setup").add_commands() - vim.keymap.set("n", "cc", function() require('jdtls').compile() end, {buffer = bufnr, desc = "Java Errors"}) - end, - } - require("jdtls").start_or_attach(config) - end, - }) - return true - end, - }, + -- servers = { + -- jdtls = {}, + -- }, + -- setup = { + -- jdtls = function(_, opts) + -- vim.api.nvim_create_autocmd("Filetype", { + -- pattern = "java", -- autocmd to start jdtls + -- callback = function() + -- -- use this function notation to build some variables + -- local root_markers = { ".git", "mvnw", "gradlew", "pom.xml", "build.gradle" } + -- local root_dir = require("jdtls.setup").find_root(root_markers) + -- + -- -- calculate workspace dir + -- local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") + -- local workspace_dir = vim.fn.stdpath("data") .. "/site/java/workspace-root/" .. project_name + -- -- os.execute("mkdir " .. workspace_dir) + -- + -- -- get the mason install path + -- local install_path = require("mason-registry").get_package("jdtls"):get_install_path() + -- local debug_install_path = require("mason-registry").get_package("java-debug-adapter"):get_install_path() + -- local test_install_path = require("mason-registry").get_package("java-test"):get_install_path() + -- + -- -- get the current OS + -- local os + -- if vim.fn.has("macunix") then + -- os = "mac" + -- elseif vim.fn.has("win32") then + -- os = "win" + -- else + -- os = "linux" + -- end + -- + -- -- return the server config + -- local config = { + -- cmd = { + -- "java", + -- "-Declipse.application=org.eclipse.jdt.ls.core.id1", + -- "-Dosgi.bundles.defaultStartLevel=4", + -- "-Declipse.product=org.eclipse.jdt.ls.core.product", + -- "-Dlog.protocol=true", + -- "-Dlog.level=ALL", + -- -- "-javaagent:" .. install_path .. "/lombok.jar", + -- "-Xms1g", + -- "--add-modules=ALL-SYSTEM", + -- "--add-opens", + -- "java.base/java.util=ALL-UNNAMED", + -- "--add-opens", + -- "java.base/java.lang=ALL-UNNAMED", + -- "-jar", + -- vim.fn.glob(install_path .. "/plugins/org.eclipse.equinox.launcher_*.jar"), + -- "-configuration", + -- install_path .. "/config_" .. os, + -- "-data", + -- workspace_dir, + -- }, + -- root_dir = root_dir, + -- settings = { + -- java = { + -- referencesCodeLens = { + -- enabled = false, + -- }, + -- }, + -- }, + -- init_options = { + -- bundles = vim.list_extend({ + -- vim.fn.glob(debug_install_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", true), + -- }, vim.split(vim.fn.glob(test_install_path .. "/extension/server/*.jar", true), "\n")), + -- }, + -- ["on_attach"] = function(client, bufnr) + -- require("jdtls").setup_dap() + -- require("jdtls.setup").add_commands() + -- vim.keymap.set("n", "cc", function() require('jdtls').compile() end, {buffer = bufnr, desc = "Java Errors"}) + -- end, + -- } + -- require("jdtls").start_or_attach(config) + -- end, + -- }) + -- return true + -- end, + -- }, }, }, } diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 1fa0b8a..3b10ec9 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -3,9 +3,9 @@ return { "goolord/alpha-nvim", enabled = false, }, - { - "stevearc/dressing.nvim", - }, + -- { + -- "stevearc/dressing.nvim", + -- }, { "akinsho/bufferline.nvim", enabled = false, @@ -33,10 +33,10 @@ return { -- paste_on_remote_yank = true, -- }, -- }, - { - "ggandor/flit.nvim", - enabled = false, - }, + -- { + -- "ggandor/flit.nvim", + -- enabled = false, + -- }, -- { -- "rafamadriz/friendly-snippets", -- enabled = false, @@ -50,16 +50,29 @@ return { }, }, }, + { + "folke/flash.nvim", + opts = { + modes = { + search = { + enabled = false, + }, + char = { + enabled = false, + }, + } + }, + }, { "echasnovski/mini.pairs", enabled = false, }, - { "ellisonleao/gruvbox.nvim" }, - {"rktjmp/lush.nvim" }, - {"briones-gabriel/darcula-solid.nvim", - depends = {"rktjmp/lush.nvim" }, - }, - { "doums/darcula" }, + -- { "ellisonleao/gruvbox.nvim" }, + -- {"rktjmp/lush.nvim" }, + -- {"briones-gabriel/darcula-solid.nvim", + -- depends = {"rktjmp/lush.nvim" }, + -- }, + -- { "doums/darcula" }, { "echasnovski/mini.indentscope", opts = {