diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua index cd0e2267..fc929f22 100644 --- a/home/.config/nvim/ftplugin/java.lua +++ b/home/.config/nvim/ftplugin/java.lua @@ -2,7 +2,7 @@ local nvim_local_dir = vim.fn.expand("~/.local/share/nvim") local lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar" local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name -local mason = require("plugins.mason") +local lsp = require("plugins.lsp") require("jdtls").start_or_attach({ cmd = { @@ -45,8 +45,8 @@ require("jdtls").start_or_attach({ handlers = { ["language/status"] = function() end, }, - capabilities = mason.get_capabilities(), - on_attach = mason.on_attach, + capabilities = lsp.get_capabilities(), + on_attach = lsp.on_attach, }) function RunJava() diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index 33c92035..14ec44aa 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,4 +1,4 @@ require("settings") require("neovide") require("highlight_yank") -require("plugins.init") +require("plugins.lazy") diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/lazy.lua similarity index 99% rename from home/.config/nvim/lua/plugins/init.lua rename to home/.config/nvim/lua/plugins/lazy.lua index 0018004e..54cd7eb6 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/lazy.lua @@ -85,7 +85,7 @@ local plugins = { -- Package manager for LSP servers, DAP adapters etc. { "williamboman/mason.nvim", - config = require("plugins.mason").setup, + config = require("plugins.lsp").setup, dependencies = { "neovim/nvim-lspconfig", "williamboman/mason-lspconfig.nvim", diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/lsp.lua similarity index 100% rename from home/.config/nvim/lua/plugins/mason.lua rename to home/.config/nvim/lua/plugins/lsp.lua