aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/lua/lsp.lua18
-rw-r--r--.config/nvim/lua/plugins.lua8
2 files changed, 26 insertions, 0 deletions
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 3178a5d..47677bc 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -171,6 +171,24 @@ lspconfig.ols.setup({
}
})
+local lsp = require("lsp-zero")
+local lspconfig = require("lspconfig")
+lsp.extend_lspconfig()
+
+local configs = require("lspconfig.configs")
+if not configs.jails then
+ configs.jails = {
+ default_config = {
+ cmd = { "jails" },
+ root_dir = lspconfig.util.root_pattern("jails.json", "build.jai", "main.jai"),
+ filetypes = { "jai" },
+ name = "Jails",
+ },
+ }
+end
+lspconfig.jails.setup({})
+vim.filetype.add({ extension = { jai = "jai", } })
+
vim.api.nvim_create_autocmd('BufWritePre', {
pattern = '*.go',
callback = function()
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 0a72469..45d7988 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -146,5 +146,13 @@ return require('lazy').setup({
event = "VeryLazy",
opts = {
},
+ "VonHeikemen/lsp-zero.nvim",
+ branch = "v2.x",
+ config = false,
+ init = function()
+ -- Disable automatic setup, we are doing it manually
+ vim.g.lsp_zero_extend_cmp = 0
+ vim.g.lsp_zero_extend_lspconfig = 0
+ end,
},
})