Neovim: reworked lsp setup, along with some minor tweaks

4 files changed, 30 insertions, 54 deletions

diff --git a/.config/nvim/lua/custom/plugins/TODO-completions.lua b/.config/nvim/lua/custom/plugins/TODO-completion.lua
index 0699e9b..0699e9b 100644
--- a/.config/nvim/lua/custom/plugins/TODO-completions.lua
+++ b/.config/nvim/lua/custom/plugins/TODO-completion.lua
diff --git a/.config/nvim/lua/custom/plugins/TODO-lsp.lua b/.config/nvim/lua/custom/plugins/TODO-lsp.lua
deleted file mode 100644
index 74b9ed4..0000000
--- a/.config/nvim/lua/custom/plugins/TODO-lsp.lua
+++ /dev/null
@@ -1,48 +0,0 @@
-return {
-    {
-        'williamboman/mason.nvim',
-        lazy = false,
-        config = function()
-            require('mason').setup()
-        end,
-    },
-    {
-        'williamboman/mason-lspconfig.nvim',
-        lazy = false,
-        config = function()
-            require('mason-lspconfig').setup({
-                ensure_installed = {
-                    'lua_ls',
-                    'clangd',
-                    'gradle_ls',
-                    'jdtls',
-                    'kotlin_language_server',
-                    'pyright',
-                    'rust_analyzer',
-                    'taplo',
-                    'bashls',
-                    'lemminx',
-                    'yamlls',
-                },
-            })
-        end,
-    },
-    {
-        'neovim/nvim-lspconfig',
-        lazy = false,
-        config = function()
-            local lspconfig = require('lspconfig')
-            lspconfig.lua_ls.setup({})
-            lspconfig.clangd.setup({})
-            lspconfig.gradle_ls.setup({})
-            lspconfig.jdtls.setup({})
-            lspconfig.kotlin_language_server.setup({})
-            lspconfig.pyright.setup({})
-            lspconfig.rust_analyzer.setup({})
-            lspconfig.taplo.setup({})
-            lspconfig.bashls.setup({})
-            lspconfig.lemminx.setup({})
-            lspconfig.yamlls.setup({})
-        end,
-    },
-}
diff --git a/.config/nvim/lua/custom/plugins/lsp.lua b/.config/nvim/lua/custom/plugins/lsp.lua
new file mode 100644
index 0000000..e555ace
--- /dev/null
+++ b/.config/nvim/lua/custom/plugins/lsp.lua
@@ -0,0 +1,30 @@
+return {
+    {
+        'neovim/nvim-lspconfig',
+        lazy = false,
+        dependencies = {
+            'williamboman/mason.nvim',
+            'williamboman/mason-lspconfig.nvim',
+
+            {
+                'folke/lazydev.nvim',
+                ft = 'lua',
+                opts = { library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } } },
+            },
+
+            -- FIXME: Starts with a black blackground
+            -- Desired behaviour is same color as background or transparent
+            -- Progress ui
+            { 'j-hui/fidget.nvim', opts = {} },
+
+            -- AUtoformatting
+            -- 'stevear/conform.nvim',
+
+            -- Schema info
+            -- 'b0o/SchemaStore.nvim',
+        },
+        config = function()
+            require('custom.lsp')
+        end,
+    },
+}
diff --git a/.config/nvim/lua/custom/plugins/utility.lua b/.config/nvim/lua/custom/plugins/utility.lua
index 41f2925..79eac83 100644
--- a/.config/nvim/lua/custom/plugins/utility.lua
+++ b/.config/nvim/lua/custom/plugins/utility.lua
@@ -37,12 +37,6 @@ return {
             vim.keymap.set('n', '<leader>nc', ':Telescope neoclip plus<cr>', { desc = '[N]eo[c]lip History' })
         end,
     },
-    { 'Bilal2453/luvit-meta', lazy = true },
-    {
-        'folke/lazydev.nvim',
-        ft = 'lua',
-        opts = { library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } } },
-    },
     {
         'mbbill/undotree',
         config = function()