feat: Adding nvim-lspconfig and Mason back in for now to get the config

working well for production work.

nvim/after/lsp/gdscript.lua

@@ -2,8 +2,6 @@
 
 return {
     cmd = vim.lsp.rpc.connect('127.0.0.1', 6005),
-    filetypes = {
-        'gd', 'gdscript', 'gdscript3'
-    },
+    filetypes = { 'gdscript' },
     root_markers = { 'project.godot', '.git' },
 }

nvim/after/lsp/jinja_lsp.lua

@@ -1,9 +1,3 @@
--- Jinja LSP setup tuned to include Tera templates
--- TODO: Not currently working correctly for Tera templates
-
 return {
-    name = 'jinja_lsp',
-    cmd = { 'jinja-lsp' },
-    filetypes = { 'jinja', 'tera' },
-    root_markers = { '.git' },
+    filetypes = { 'tera', 'jinja2' },
 }

nvim/lua/plugins/language_support.lua

@@ -49,9 +49,35 @@ vim.api.nvim_create_autocmd('LspAttach', {
 })
 
 vim.pack.add({
-    'https://github.com/neovim/nvim-lspconfig'
+    'https://github.com/neovim/nvim-lspconfig',
+    'https://github.com/mason-org/mason-lspconfig.nvim',
+    'https://github.com/mason-org/mason.nvim',
 })
 
+require('mason').setup()
+require('mason-lspconfig').setup {
+    automatic_enable = true,
+    ensure_installed = {
+        -- 'ansible-lint',
+        'ansiblels',
+        'arduino_language_server',
+        'bashls',
+        -- 'cfn-lint',
+        'clangd',
+        'html',
+        -- 'htmlhint',
+        'intelephense',
+        'jinja_lsp',
+        'lua_ls',
+        'marksman',
+        'pylsp',
+        'r_language_server',
+        'rust_analyzer',
+        -- 'shellcheck',
+        'yamlls',
+    }
+}
+
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 
 capabilities.textDocument.completion.completionItem.snippetSupport = true
@@ -66,7 +92,7 @@ local enabled_lsps = {
     'arduino_language_server',
     'clangd',
     'bashls',
-    'gdscript',
+    'gdscript', -- Local only config
     'html',
     'intelephense',
     'jinja_lsp',