diff --git a/ftplugin/java.lua b/ftplugin/java.lua index e9b8248..8b13789 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -1,4 +1 @@ -vim.opt_local.shiftwidth = 2 -vim.opt_local.tabstop = 2 -vim.opt_local.tw = 180 -vim.opt_local.colorcolumn = "+1" + diff --git a/ftplugin/java.vim b/ftplugin/java.vim new file mode 100644 index 0000000..95c752b --- /dev/null +++ b/ftplugin/java.vim @@ -0,0 +1 @@ +set tw=120 diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 5e45b8e..0460c4e 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -13,7 +13,7 @@ return { "godlygeek/tabular", "tpope/vim-sleuth", "norcalli/nvim-colorizer.lua", - { "ixru/nvim-markdown", ft = "markdown" }, + "ixru/nvim-markdown", "KeitaNakamura/tex-conceal.vim", "skywind3000/asyncrun.vim", "airblade/vim-gitgutter", diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 16adf41..4cd33e8 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -3,7 +3,6 @@ return { { "mfussenegger/nvim-jdtls", - ft = "java", config = function() local jdtls = require("jdtls") @@ -13,31 +12,8 @@ return { -- Path to your exported Eclipse/IntelliJ style xml local style_path = vim.fn.expand("~/.config/nvim/GoogleStyle.xml") - local java_home = os.getenv("NVIM_JDTLS_JAVA_HOME") - local config = { - cmd = { - java_home .. "/bin/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", - "-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( - vim.fn.stdpath("data") .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar" - ), - "-configuration", - vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/jdtls/config_mac"), - "-data", - vim.fn.expand("~/.cache/jdtls-workspace/") .. "/" .. root_dir:gsub(":", "_"), - }, + cmd = { "jdtls" }, -- or path to your startup script root_dir = root_dir, settings = { java = { @@ -187,7 +163,6 @@ return { local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { - "jdtls", "stylua", "black", "clang-format", @@ -215,4 +190,4 @@ return { }) end, }, -} +} \ No newline at end of file