Merge branch 'main' into development

nvim/lua/plugins/language_support.lua

@@ -1,7 +1,7 @@
 -- Treesitter
 local rocks_path = os.getenv('HOME') .. "/.luarocks/lib/luarocks/rocks-5.1"
 
--- Pick up the installed
+-- Pick up the installed parsers in the install dir
 for _, parser_dir in ipairs(vim.fn.glob(rocks_path .. '/tree-sitter-*/*/', true, true)) do
     vim.opt.runtimepath:prepend(parser_dir)
 end
@@ -9,7 +9,6 @@ end
 -- Start treesitter parsing on the current buffer
 vim.api.nvim_create_autocmd("FileType", {
     callback = function(ev)
-        -- Use pcall to prevent blocking errors
         pcall(vim.treesitter.start, ev.buf)
     end
 })
@@ -53,12 +52,11 @@ vim.api.nvim_create_autocmd('LspAttach', {
         --     end,
         -- })
 
-        -- Keyboard Mappings
         local bufnr = args.buf
-
         local bufopts = { noremap = true, silent = true, buffer = bufnr }
-        vim.keymap.set('n', '<C-[>', vim.diagnostic.goto_prev, bufopts)
-        vim.keymap.set('n', '<C-]>', vim.diagnostic.goto_next, bufopts)
+
+        vim.keymap.set('n', '<C-[>', function() vim.diagnostic.jump({ count = -1, float = true }) end, bufopts)
+        vim.keymap.set('n', '<C-]>', function() vim.diagnostic.jump({ count = 1, float = true }) end, bufopts)
         vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, bufopts)
         vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
         vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
@@ -74,5 +72,14 @@ vim.api.nvim_create_autocmd('LspAttach', {
 })
 
 -- Enable LSP engines
--- vim.lsp.enable('clangd')
-vim.lsp.enable('gdscript')
+local enabled_lsps = {
+    'clangd',
+    'gdscript',
+    'jinja_lsp',
+    'pylsp',
+    'r_language_server',
+}
+
+for _, lsp in pairs(enabled_lsps) do
+    vim.lsp.enable(lsp)
+end

nvim/lua/plugins/lualine.lua

@@ -7,7 +7,6 @@ local function get_schema()
 end
 
 vim.pack.add({
-    -- 'https://github.com/nvim-tree/nvim-web-devicons',
     'https://github.com/nvim-lualine/lualine.nvim'
 })
 

nvim/lua/plugins/luasnip.lua

@@ -1,5 +1,5 @@
 vim.pack.add({
-    -- 'https://github.com/saadparwaiz1/cmp_luasnip',
+    'https://github.com/saadparwaiz1/cmp_luasnip',
     'https://github.com/rafamadriz/friendly-snippets',
     'https://github.com/L3MON4D3/LuaSnip'
 })
@@ -18,7 +18,8 @@ local function luasnip_dependency_update()
                 if out.code == 0 then
                     vim.notify('LuaSnip jsregexp built successfully!', vim.log.levels.INFO)
                 else
-                    vim.notify('Failed to build LuaSnip jsregexp:\n' .. (out.stderr or out.stdout or ''), vim.log.levels.ERROR)
+                    vim.notify('Failed to build LuaSnip jsregexp:\n' .. (out.stderr or out.stdout or ''),
+                        vim.log.levels.ERROR)
                 end
             end)
         end)
@@ -42,6 +43,6 @@ require('luasnip.loaders.from_vscode').lazy_load()
 require('luasnip.loaders.from_lua').lazy_load({ paths = "./snippets" })
 
 -- TODO: Figure out keymappings that make sense
-vim.keymap.set({ 'i' }, '<C-k>', function() require('luasnip').expand() end, { silent = true })
-vim.keymap.set({ 'i', 's' }, '<C-l>', function() require('luasnip').jump(1) end, { silent = true })
-vim.keymap.set({ 'i', 's' }, '<C-j>', function() require('luasnip').jump(-1) end, { silent = true })
+vim.keymap.set({ 'i' }, '<C-K>', function() require('luasnip').expand() end, { silent = true })
+vim.keymap.set({ 'i', 's' }, '<C-L>', function() require('luasnip').jump(1) end, { silent = true })
+vim.keymap.set({ 'i', 's' }, '<C-H>', function() require('luasnip').jump(-1) end, { silent = true })

nvim/lua/plugins/mason.lua

@@ -16,7 +16,6 @@ require('mason-lspconfig').setup {
         'marksman',                -- markdown
         'pylsp',                   -- Python
         'rust_analyzer',           -- Rust
-        'ts_ls',                   -- Typscript
         'yamlls',                  -- YAML
     }
 }

nvim/lua/plugins/telescope.lua

@@ -1,6 +1,5 @@
 vim.pack.add({
-    'https://github.com/kevinhwang91/nvim-bqf',
-    'https://github.com/nvim-telescope/telescope-file-browser.nvim',
+    -- 'https://github.com/kevinhwang91/nvim-bqf',
     'https://github.com/nvim-lua/plenary.nvim',
     'https://github.com/nvim-telescope/telescope.nvim',
 })
@@ -23,9 +22,7 @@ require('telescope').setup {
         layout_config = { prompt_position = 'bottom' },
         -- layout_strategy = 'vertical',
         mappings = {
-            i = {
-                ['<ESC>'] = require('telescope.actions').close,
-            },
+            i = { ['<ESC>'] = require('telescope.actions').close, },
         },
         prompt_prefix = '   ',
         results_title = false,
@@ -35,7 +32,6 @@ require('telescope').setup {
     },
     pickers = {
         diagnostics = {
-            -- theme = 'ivy',
             initial_mode = 'normal',
             layout_config = {
                 preview_cutoff = 9999,
@@ -46,18 +42,12 @@ require('telescope').setup {
 
 local builtin = require('telescope.builtin')
 
-vim.keymap.set('n', ';f', function()
-    builtin.find_files({
-        no_ignore = false,
-        hidden = true,
-    })
-end)
-
-vim.keymap.set('n', ';r', function() builtin.live_grep() end)
-vim.keymap.set('n', ';b', function() builtin.buffers() end)
-vim.keymap.set('n', ';h', function() builtin.help_tags() end)
 vim.keymap.set('n', ';;', function() builtin.resume() end)
+vim.keymap.set('n', ';b', function() builtin.buffers() end)
 vim.keymap.set('n', ';d', function() builtin.diagnostics() end)
-vim.keymap.set('n', ';t', function() builtin.treesitter() end)
+vim.keymap.set('n', ';f', function() builtin.find_files({ no_ignore = false, hidden = true }) end)
+vim.keymap.set('n', ';h', function() builtin.help_tags() end)
+vim.keymap.set('n', ';r', function() builtin.live_grep() end)
 vim.keymap.set('n', ';s', function() builtin.lsp_document_symbols() end)
+vim.keymap.set('n', ';t', function() builtin.treesitter() end)
 vim.keymap.set('n', ';w', function() builtin.lsp_dynamic_workspace_symbols() end)