Moving to individual plugin files for lazy

Signed-off-by: Taken <taken@mairimashita.org>

lua/taken/plugins/lsp/lspconfig.lua

@@ -1,89 +1,88 @@
-local lspconfig_status, lspconfig = pcall(require, "lspconfig")
-if not lspconfig_status then
-    return
-end
+return {
+    "neovim/nvim-lspconfig",
+    dependencies = "hrsh7th/cmp-nvim-lsp",
+    config = function()
+        local lspconfig = require("lspconfig")
+        local cmp_nvim_lsp = require("cmp_nvim_lsp")
 
-local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
-if not cmp_nvim_lsp_status then
-    return
-end
+        local on_attach = function(client, bufnr)
+            local opts = { noremap = true, silent = true, buffer = bufnr }
+            vim.keymap.set("n", "gd", function()
+                vim.lsp.buf.definition()
+            end, opts)
+            vim.keymap.set("n", "K", function()
+                vim.lsp.buf.hover()
+            end, opts)
+            vim.keymap.set("n", "<leader>vws", function()
+                vim.lsp.buf.workspace_symbol()
+            end, opts)
+            vim.keymap.set("n", "<leader>vd", function()
+                vim.diagnostic.open_float()
+            end, opts)
+            vim.keymap.set("n", "[d", function()
+                vim.diagnostic.goto_next()
+            end, opts)
+            vim.keymap.set("n", "]d", function()
+                vim.diagnostic.goto_prev()
+            end, opts)
+            vim.keymap.set("n", "<leader>vca", function()
+                vim.lsp.buf.code_action()
+            end, opts)
+            vim.keymap.set("n", "<leader>vrr", function()
+                vim.lsp.buf.references()
+            end, opts)
+            vim.keymap.set("n", "<leader>vrn", function()
+                vim.lsp.buf.rename()
+            end, opts)
+            vim.keymap.set("i", "<C-h>", function()
+                vim.lsp.buf.signature_help()
+            end, opts)
+        end
 
-local on_attach = function(client, bufnr)
-    local opts = { noremap = true, silent = true, buffer = bufnr }
-    vim.keymap.set("n", "gd", function()
-        vim.lsp.buf.definition()
-    end, opts)
-    vim.keymap.set("n", "K", function()
-        vim.lsp.buf.hover()
-    end, opts)
-    vim.keymap.set("n", "<leader>vws", function()
-        vim.lsp.buf.workspace_symbol()
-    end, opts)
-    vim.keymap.set("n", "<leader>vd", function()
-        vim.diagnostic.open_float()
-    end, opts)
-    vim.keymap.set("n", "[d", function()
-        vim.diagnostic.goto_next()
-    end, opts)
-    vim.keymap.set("n", "]d", function()
-        vim.diagnostic.goto_prev()
-    end, opts)
-    vim.keymap.set("n", "<leader>vca", function()
-        vim.lsp.buf.code_action()
-    end, opts)
-    vim.keymap.set("n", "<leader>vrr", function()
-        vim.lsp.buf.references()
-    end, opts)
-    vim.keymap.set("n", "<leader>vrn", function()
-        vim.lsp.buf.rename()
-    end, opts)
-    vim.keymap.set("i", "<C-h>", function()
-        vim.lsp.buf.signature_help()
-    end, opts)
-end
+        local capabilities = cmp_nvim_lsp.default_capabilities()
 
-local capabilities = cmp_nvim_lsp.default_capabilities()
+        local signs = { Error = " ", Warn = " ", Hint = "ﴞ ", Info = " " }
+        for type, icon in pairs(signs) do
+            local hl = "DiagnosticSign" .. type
+            vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
+        end
 
-local signs = { Error = " ", Warn = " ", Hint = "ﴞ ", Info = " " }
-for type, icon in pairs(signs) do
-    local hl = "DiagnosticSign" .. type
-    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-end
-
-lspconfig["lua_ls"].setup({
-    capabilities = capabilities,
-    on_attach = on_attach,
-    settings = {
-        Lua = {
-            diagnostics = {
-                globals = { "vim" },
+        lspconfig["lua_ls"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+            settings = {
+                Lua = {
+                    diagnostics = {
+                        globals = { "vim" },
+                    },
+                },
             },
-        },
-    },
-})
+        })
 
-lspconfig["html"].setup({
-    capabilities = capabilities,
-    on_attach = on_attach,
-})
+        lspconfig["html"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+        })
 
-lspconfig["tsserver"].setup({
-    capabilities = capabilities,
-    on_attach = on_attach,
-})
+        lspconfig["tsserver"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+        })
 
-lspconfig["cssls"].setup({
-    capabilities = capabilities,
-    on_attach = on_attach,
-})
+        lspconfig["cssls"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+        })
 
-lspconfig["pyright"].setup({
-    capabilities = capabilities,
-    on_attach = on_attach,
-})
+        lspconfig["pyright"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+        })
 
-lspconfig["powershell_es"].setup({
-    capabilities = capabilities,
-    on_attach = on_attach,
-    bundle_path = vim.fn.stdpath("data") .. "/mason/packages/powershell-editor-services",
-})
+        lspconfig["powershell_es"].setup({
+            capabilities = capabilities,
+            on_attach = on_attach,
+            bundle_path = vim.fn.stdpath("data") .. "/mason/packages/powershell-editor-services",
+        })
+    end,
+}

lua/taken/plugins/lsp/mason.lua

@@ -1,37 +1,38 @@
-local mason_status, mason = pcall(require, "mason")
-if not mason_status then
-    return
-end
-
-local mason_lspconfig_status, mason_lspconfig = pcall(require, "mason-lspconfig")
-if not mason_lspconfig_status then
-    return
-end
-
-local mason_null_ls_status, mason_null_ls = pcall(require, "mason-null-ls")
-if not mason_null_ls_status then
-    return
-end
-
-mason.setup()
-
-mason_lspconfig.setup({
-    ensure_installed = {
-        "tsserver",
-        "html",
-        "cssls",
-        "lua_ls",
-        "pyright",
-        "gopls",
-        "powershell_es",
+return {
+    "williamboman/mason.nvim",
+    build = function()
+        pcall(vim.cmd, "MasonUpdate")
+    end,
+    dependencies = {
+        "williamboman/mason-lspconfig.nvim",
+        "jayp0521/mason-null-ls.nvim",
     },
-    automatic_installation = true,
-})
+    config = function()
+        local mason = require("mason")
+        local mason_lspconfig = require("mason-lspconfig")
+        local mason_null_ls = require("mason-null-ls")
 
-mason_null_ls.setup({
-    ensure_installed = {
-        "stylua",
-        "clang-format",
-    },
-    automatic_installation = true,
-})
+        mason.setup()
+
+        mason_lspconfig.setup({
+            ensure_installed = {
+                "tsserver",
+                "html",
+                "cssls",
+                "lua_ls",
+                "pyright",
+                "gopls",
+                "powershell_es",
+            },
+            automatic_installation = true,
+        })
+
+        mason_null_ls.setup({
+            ensure_installed = {
+                "stylua",
+                "clang-format",
+            },
+            automatic_installation = true,
+        })
+    end,
+}

lua/taken/plugins/lsp/null-ls.lua

@@ -1,14 +1,16 @@
-local setup, null_ls = pcall(require, "null-ls")
-if not setup then
-    return
-end
+return {
+    "jose-elias-alvarez/null-ls.nvim",
+    config = function()
+        local null_ls = require("null-ls")
 
-local formatting = null_ls.builtins.formatting
-local diagnostics = null_ls.builtins.diagnostics
+        local formatting = null_ls.builtins.formatting
+        local diagnostics = null_ls.builtins.diagnostics
 
-null_ls.setup({
-    sources = {
-        formatting.stylua,
-        formatting.clang_format,
-    },
-})
+        null_ls.setup({
+            sources = {
+                formatting.stylua,
+                formatting.clang_format,
+            },
+        })
+    end,
+}