lua/plugins/completions.lua

@@ -38,10 +38,8 @@ return {
         'clangd',
         'cmake',
         'jsonls',
-        'lemminx',
         'lua_ls',
-        'pyright',
-        'ruff_lsp',
+        'lemminx',
         'vimls',
         'yamlls',
       },
@@ -55,7 +53,8 @@ return {
 
         ['lua_ls'] = function()
           require('neodev').setup()
-          require('lspconfig').lua_ls.setup({
+          local lspconfig = require('lspconfig')
+          lspconfig.lua_ls.setup({
             settings = {
               Lua = {
                 diagnostics = {
@@ -65,19 +64,7 @@ return {
               }
             }
           })
-        end,
-
-        ['pyright'] = function()
-          require('lspconfig').pyright.setup({
-            settings = {
-              pyright = {
-                -- Using Ruff's import organizer
-                disableOrganizeImports = true,
-              },
-            }
-          })
-        end,
-
+        end
       },
     })
 
@@ -123,14 +110,13 @@ return {
         vim.keymap.set('n', '<leader>fi',
           require("actions-preview").code_actions, opts)
 
-        -- Goto mappings
-        vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+        -- Goto definition mapping
         vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
-        vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
-        vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+        -- TODO: nnoremap <silent> <leader>gt <Plug>(coc-type-definition)
+        -- TODO: nnoremap <silent> <leader>gu <Plug>(coc-references-used)
 
         -- Get references to symbol under cursor, store in quickfix window
-        vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+        vim.keymap.set('n', '<leader>gr', vim.lsp.buf.references, opts)
 
         -- Refactoring mappings
         vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)

lua/plugins/unimpaired.lua

@@ -0,0 +1,6 @@
+return {
+  'tummetott/unimpaired.nvim',
+  config = function()
+    require('unimpaired').setup({})
+  end
+}

lua/plugins/utilities.lua

@@ -1,5 +0,0 @@
-return {
-  { 'tummetott/unimpaired.nvim' },
-  { 'stevearc/dressing.nvim' },
-  { 'kevinhwang91/nvim-bqf' },
-}

lua/statusline.lua

@@ -121,11 +121,7 @@ function statusline.active()
     -- loclist flag, query the window info.
     local info = vim.fn.getwininfo(vim.fn.win_getid())[1]
     if mode == 'Normal' then
-      if info.loclist == 1 then
-        mode = 'Location'
-      else
-        mode = 'Quickfix'
-      end
+      if info.loclist then mode = 'Location' else mode = 'Quickfix' end
     end
     local title = info.variables.quickfix_title
     return special('StatusLineLight', mode, title)