diff --git a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua index 8d8706d..3bb09c1 100644 --- a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua +++ b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua @@ -4,33 +4,33 @@ local capabilities = configs.capabilities local lspconfig = require("lspconfig") -local servers = { "tsserver", "tailwindcss", "eslint", "gopls", "rust_analyzer" } +local servers = { "tsserver", "tailwindcss", "eslint", "gopls" } local function organize_imports() - local params = { - command = "_typescript.organizeImports", - arguments = { vim.api.nvim_buf_get_name(0) }, - title = "", - } - vim.lsp.buf.execute_command(params) + local params = { + command = "_typescript.organizeImports", + arguments = { vim.api.nvim_buf_get_name(0) }, + title = "", + } + vim.lsp.buf.execute_command(params) end for _, lsp in ipairs(servers) do - if lsp == "tsserver" then - lspconfig[lsp].setup({ - on_attach = on_attach, - capabilities = capabilities, - commands = { - OrganizeImports = { - organize_imports, - description = "Organize Imports", - }, - }, - }) - else - lspconfig[lsp].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end + if lsp == "tsserver" then + lspconfig[lsp].setup({ + on_attach = on_attach, + capabilities = capabilities, + commands = { + OrganizeImports = { + organize_imports, + description = "Organize Imports", + }, + }, + }) + else + lspconfig[lsp].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end end diff --git a/pkgs/nvchad/nvim/lua/configs/nvim-lint.lua b/pkgs/nvchad/nvim/lua/configs/nvim-lint.lua deleted file mode 100644 index 27a9b07..0000000 --- a/pkgs/nvchad/nvim/lua/configs/nvim-lint.lua +++ /dev/null @@ -1,21 +0,0 @@ --- Doesn't work - -local lint = require("lint") - -lint.linters_by_ft = { - lua = { "luacheck" }, - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { { "eslint_d" } }, - nix = { "statix" }, -} - -local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) - -vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, { - group = lint_augroup, - callback = function() - lint.try_lint() - end, -}) diff --git a/pkgs/nvchad/nvim/lua/configs/overrides.lua b/pkgs/nvchad/nvim/lua/configs/overrides.lua index 447fd22..635ebe0 100644 --- a/pkgs/nvchad/nvim/lua/configs/overrides.lua +++ b/pkgs/nvchad/nvim/lua/configs/overrides.lua @@ -1,63 +1,65 @@ local M = {} M.treesitter = { - ensure_installed = { - -- defaults - "vim", - "lua", + ensure_installed = { + -- defaults + "vim", + "lua", - -- web dev - "html", - "css", - "javascript", - "typescript", - "tsx", + -- web dev + "html", + "css", + "javascript", + "typescript", + "tsx", - -- nix - "nix", + -- nix + "nix", - -- go - "go", - "gomod", - "gowork", - "gosum", - - -- rust - "rust", - }, + -- go + "go", + "gomod", + "gowork", + "gosum", + }, } M.mason = { - ensure_installed = { - -- defaults - "lua-language-server", - "stylua", - "luacheck", + ensure_installed = { + -- defaults + "lua-language-server", + "stylua", + "luacheck", - -- web dev - "css-lsp", - "html-lsp", - "prettierd", - "eslint-lsp", - "eslint_d", - "typescript-language-server", - "tailwindcss-language-server", + -- web dev + "css-lsp", + "html-lsp", + "prettierd", + "eslint-lsp", + "eslint_d", + "typescript-language-server", + "tailwindcss-language-server", - -- nix - "nil", + -- nix + "nil", - -- rust - "rust-analyzer", - "rustfmt", - "codelldb", - }, + -- go + "gopls", + "goimports", + "gofumpt", + "gomodifytags", + "impl", + "iferr", + "staticcheck", + "delve", + }, } M.telescope = { - defaults = { - winblend = 40, - pumblend = 40, - }, + defaults = { + winblend = 40, + pumblend = 40, + }, } return M diff --git a/pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua b/pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua deleted file mode 100644 index 52ce836..0000000 --- a/pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua +++ /dev/null @@ -1,17 +0,0 @@ -local configs = require("nvchad.configs.lspconfig") -local on_attach = configs.on_attach -local capabilities = configs.capabilities - -vim.g.rustaceanvim = { - server = { - on_attach = on_attach, - capabilities = capabilities, - default_settings = { - ["rust-analyzer"] = { - cargo = { - allFeatures = true, - }, - }, - }, - }, -} diff --git a/pkgs/nvchad/nvim/lua/plugins/init.lua b/pkgs/nvchad/nvim/lua/plugins/init.lua index e2969ef..c46bae9 100644 --- a/pkgs/nvchad/nvim/lua/plugins/init.lua +++ b/pkgs/nvchad/nvim/lua/plugins/init.lua @@ -3,6 +3,8 @@ local overrides = require("configs.overrides") local plugins = { { "stevearc/conform.nvim", + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, config = function() require("configs.conform") end, @@ -93,35 +95,5 @@ local plugins = { "folke/neodev.nvim", event = "VeryLazy", }, - { - "ray-x/go.nvim", - dependencies = { - "ray-x/guihua.lua", - "neovim/nvim-lspconfig", - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - "theHamsta/nvim-dap-virtual-text", - }, - config = function() - require("go").setup() - end, - event = { "CmdlineEnter" }, - ft = { "go", "gomod" }, - build = ':lua require("go.install").update_all_sync()', - }, - { - "mrcjkb/rustaceanvim", - version = "^4", - ft = { "rust" }, - config = function() - require("configs.rustaceanvim") - end, - dependencies = { - "neovim/nvim-lspconfig", - "mfussenegger/nvim-dap", - "rcarriga/nvim-dap-ui", - "theHamsta/nvim-dap-virtual-text", - }, - }, } return plugins