diff --git a/lua/plugins/format.lua b/lua/plugins/format.lua index f20f42c..74e0fb8 100644 --- a/lua/plugins/format.lua +++ b/lua/plugins/format.lua @@ -3,10 +3,10 @@ return { lazy = false, opts = { notify_on_error = true, - formatters_by_ft = { - svelte = { "prettier" }, - vue = { "prettier" }, - }, + -- formatters_by_ft = { + -- svelte = { "prettier" }, + -- vue = { "prettier" }, + -- }, format_on_save = { lsp_fallback = true, timeout_ms = 1500, @@ -15,12 +15,5 @@ return { config = function(_, opts) local plug = require('conform') plug.setup(opts) - - -- vim.api.nvim_create_autocmd("BufWritePre", { - -- pattern = "*", - -- callback = function(args) - -- plug.format({ bufnr = args.buf }) - -- end, - -- }) end, } diff --git a/lua/plugins/lsp-java.lua b/lua/plugins/lsp-java.lua deleted file mode 100644 index b4aaf79..0000000 --- a/lua/plugins/lsp-java.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - 'mfussenegger/nvim-jdtls', - layz = false, - config = function() - local home = os.getenv('HOME') - local workspace_folder = home .. "/.local/share/eclipse/" .. vim.fn.fnamemodify(root_dir, ":p:h:t") - local config = { - cmd = { - '/usr/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', - '-Xmx1g', - '--add-modules=ALL-SYSTEM', - '--add-opens', 'java.base/java.util=ALL-UNNAMED', - '--add-opens', 'java.base/java.lang=ALL-UNNAMED', - - '-javaagent:/usr/share/java/lombok/lombok.jar', - - '-jar', home .. '/.local/share/jdtls/plugins/org.eclipse.equinox.launcher_1.6.500.v20230717-2134.jar', - '-configuration', home .. '/.local/share/jdtls/config_linux', - - '-data', workspace_folder - }, - root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', 'mvnw', '.git' }, { upward = true })[1]), - } - - vim.api.nvim_create_autocmd("FileType", { - pattern = "java", - callback = function() - require('jdtls').start_or_attach(config) - end - }) - end, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 48cee6e..6bdb1a2 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -19,14 +19,9 @@ return { end) require('mason-lspconfig').setup { - ensure_installed = { 'rust_analyzer', 'lua_ls', 'kotlin_language_server' }, + ensure_installed = { 'rust_analyzer', 'lua_ls' }, handlers = { - lsp_zero.default_setup, - kotlin_language_server = function() - require('lspconfig').kotlin_language_server.setup({ - settings = { kotlin = { compiler = { jvm = { target = "17" } } } } - }) - end, + lsp_zero.default_setup } } end, }, diff --git a/lua/plugins/maven.lua b/lua/plugins/maven.lua deleted file mode 100644 index 9ecafc7..0000000 --- a/lua/plugins/maven.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - -- 'TimsDevCorner/vim-maven-plugin', - -- lazy = false -} diff --git a/lua/plugins/theme_tokyonight.lua b/lua/plugins/theme_tokyonight.lua deleted file mode 100644 index 746c79f..0000000 --- a/lua/plugins/theme_tokyonight.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - -- "folke/tokyonight.nvim", - -- lazy = false, - -- priority = 1000, - -- opts = { - -- style = "moon", - -- on_colors = function(colors) - -- colors.fg_gutter = colors.orange - -- end, - -- }, - -- config = function(_, opts) - -- require('tokyonight').setup(opts) - -- vim.cmd([[colorscheme tokyonight]]) - -- end, -}