diff options
| -rw-r--r-- | after/plugin/lsp.lua | 21 | ||||
| -rw-r--r-- | after/plugin/treesitter.lua | 2 | ||||
| -rw-r--r-- | init.lua | 2 | ||||
| -rw-r--r-- | plugin/packer_compiled.lua | 5 |
4 files changed, 24 insertions, 6 deletions
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index 8056dfa..7107dc5 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -2,14 +2,25 @@ local lsp = require("lsp-zero") lsp.preset("recommended") -lsp.ensure_installed({ - 'tsserver', - 'eslint', +local language_servers = { + 'tsserver', + 'eslint', + 'gopls', +} + +local linux_language_servers = { 'sumneko_lua', 'rust_analyzer', - 'gopls', 'clangd', -}) +} + +if io.popen("uname"):read("*a") == "Linux" then + for key, val in pairs(linux_language_servers) do + language_servers[key] = val + end +end + +lsp.ensure_installed(language_servers) -- Fix Undefined global 'vim' lsp.configure('sumneko_lua', { diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua index 2c0ff58..fe31eac 100644 --- a/after/plugin/treesitter.lua +++ b/after/plugin/treesitter.lua @@ -2,7 +2,7 @@ require'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" -- https://github.com/nvim-treesitter/nvim-treesitter ensure_installed = { - "c", "lua", "rust", 'javascript', 'typescript', 'go', 'hcl', + "c", "lua", 'rust', 'javascript', 'typescript', 'go', 'hcl', 'java', 'lua', 'make', 'perl', 'python', 'scheme', 'sql', 'svelte', 'terraform', 'yaml', 'bash', 'css', 'haskell', }, @@ -94,6 +94,8 @@ require('packer').startup(function(use) use 'numToStr/Comment.nvim' -- "gc" to comment visual regions/lines + use 'fatih/vim-go' + end) require('symbols-outline').setup { diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 7f8dc78..551530c 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -209,6 +209,11 @@ _G.packer_plugins = { loaded = true, path = "/home/mitch/.local/share/nvim/site/pack/packer/start/vim-fugitive", url = "https://github.com/tpope/vim-fugitive" + }, + ["vim-go"] = { + loaded = true, + path = "/home/mitch/.local/share/nvim/site/pack/packer/start/vim-go", + url = "https://github.com/fatih/vim-go" } } |