fix: load plugin config if plugin is installed

This commit is contained in:
Dan Anglin 2022-05-02 15:12:45 +01:00
parent 5769002097
commit d3bd6a5597
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
3 changed files with 27 additions and 9 deletions

View file

@ -1,4 +1,10 @@
require("bufferline").setup{ local ok, bufferline = pcall(require, "bufferline")
if not ok then
return
end
bufferline.setup{
options = { options = {
always_show_bufferline = true, always_show_bufferline = true,
mode = "buffers", mode = "buffers",

View file

@ -1,3 +1,9 @@
local ok, lspconfig = pcall(require, "lspconfig")
if not ok then
return
end
local custom_attach = function(client, bufnr) local custom_attach = function(client, bufnr)
local function buf_set_keymap(...) local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...) vim.api.nvim_buf_set_keymap(bufnr, ...)
@ -32,7 +38,7 @@ local custom_attach = function(client, bufnr)
end end
-- Go -- Go
require("lspconfig").gopls.setup{ lspconfig.gopls.setup{
on_attach = custom_attach, on_attach = custom_attach,
cmd = {"gopls", "serve"}, cmd = {"gopls", "serve"},
settings = { settings = {
@ -52,23 +58,23 @@ require("lspconfig").gopls.setup{
-- Golangci-lint language server -- Golangci-lint language server
-- requires golangci-lint and golangci-lint-langserver -- requires golangci-lint and golangci-lint-langserver
require("lspconfig").golangci_lint_ls.setup{} lspconfig.golangci_lint_ls.setup{}
-- Jsonnet -- Jsonnet
require("lspconfig").jsonnet_ls.setup{ lspconfig.jsonnet_ls.setup{
on_attach = custom_attach, on_attach = custom_attach,
} }
-- Terraform -- Terraform
require("lspconfig").terraformls.setup{ lspconfig.terraformls.setup{
on_attach = custom_attach, on_attach = custom_attach,
cmd = {"terraform-ls", "serve"}, cmd = {"terraform-ls", "serve"},
filetypes = {"terraform", "hcl", "tf"}, filetypes = {"terraform", "hcl", "tf"},
root_dir = require("lspconfig").util.root_pattern{".terraform", ".git", "main.tf"}, root_dir = lspconfig.util.root_pattern{".terraform", ".git", "main.tf"},
} }
-- Python -- Python
require("lspconfig").pylsp.setup{ lspconfig.pylsp.setup{
on_attach = custom_attach, on_attach = custom_attach,
cmd = { "pylsp" }, cmd = { "pylsp" },
filetypes = { "python" }, filetypes = { "python" },
@ -78,7 +84,7 @@ require("lspconfig").pylsp.setup{
local sumneko_root_path = vim.fn.expand('$HOME') .. "/Git/github.com/sumneko/lua-language-server" local sumneko_root_path = vim.fn.expand('$HOME') .. "/Git/github.com/sumneko/lua-language-server"
local sumneko_binary = sumneko_root_path .. "/bin/Linux/lua-language-server" local sumneko_binary = sumneko_root_path .. "/bin/Linux/lua-language-server"
require("lspconfig").sumneko_lua.setup { lspconfig.sumneko_lua.setup {
on_attach = custom_attach, on_attach = custom_attach,
cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"}, cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"},
settings = { settings = {

View file

@ -1,4 +1,10 @@
require("nvim-treesitter.configs").setup { local ok, treesitter = pcall(require, "nvim-treesitter.configs")
if not ok then
return
end
treesitter.setup {
ensure_installed = { ensure_installed = {
"bash", "bash",
"go", "go",