Rename mason module to lsp, packages/init.lua to lazy.lua
Better describes their usage
This commit is contained in:
parent
6c6ce53837
commit
88da85e368
4 changed files with 5 additions and 5 deletions
|
@ -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 lombok_jar = nvim_local_dir .. "/mason/packages/jdtls/lombok.jar"
|
||||||
local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t")
|
local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t")
|
||||||
local workspace_dir = nvim_local_dir .. "/jdtls-workspaces/" .. project_name
|
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({
|
require("jdtls").start_or_attach({
|
||||||
cmd = {
|
cmd = {
|
||||||
|
@ -45,8 +45,8 @@ require("jdtls").start_or_attach({
|
||||||
handlers = {
|
handlers = {
|
||||||
["language/status"] = function() end,
|
["language/status"] = function() end,
|
||||||
},
|
},
|
||||||
capabilities = mason.get_capabilities(),
|
capabilities = lsp.get_capabilities(),
|
||||||
on_attach = mason.on_attach,
|
on_attach = lsp.on_attach,
|
||||||
})
|
})
|
||||||
|
|
||||||
function RunJava()
|
function RunJava()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require("settings")
|
require("settings")
|
||||||
require("neovide")
|
require("neovide")
|
||||||
require("highlight_yank")
|
require("highlight_yank")
|
||||||
require("plugins.init")
|
require("plugins.lazy")
|
||||||
|
|
|
@ -85,7 +85,7 @@ local plugins = {
|
||||||
-- Package manager for LSP servers, DAP adapters etc.
|
-- Package manager for LSP servers, DAP adapters etc.
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
config = require("plugins.mason").setup,
|
config = require("plugins.lsp").setup,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
Loading…
Reference in a new issue