Compare commits

..

No commits in common. "39a18835a12c70964bec549412374f51d98b567b" and "44fb8a49faae89f6489f0ee7920ffa1e7f4d43eb" have entirely different histories.

3 changed files with 22 additions and 103 deletions

View File

@ -1,37 +0,0 @@
return {
"stevearc/conform.nvim",
event = { "BufReadPre", "BufNewFile" },
config = function()
local conform = require("conform")
conform.setup({
formatters_by_ft = {
javascript = { "prettier" },
typescript = { "prettier" },
javascriptreact = { "prettier" },
typescriptreact = { "prettier" },
svelte = { "prettier" },
css = { "prettier" },
html = { "prettier" },
json = { "prettier" },
yaml = { "prettier" },
markdown = { "prettier" },
graphql = { "prettier" },
lua = { "stylua" },
python = { "isort", "black" },
},
format_on_save = {
lsp_fallback = true,
async = false,
timeout_ms = 500,
},
})
vim.keymap.set({ "n", "v" }, "<leader>mp", function()
conform.format({
lsp_fallback = true,
async = false,
timeout_ms = 500,
})
end, { desc = "Format file or range (in visual mode)" })
end,
}

View File

@ -1,31 +0,0 @@
return {
"mfussenegger/nvim-lint",
event = {
"BufReadPre",
"BufNewFile",
},
config = function()
local lint = require("lint")
lint.linters_by_ft = {
javascript = { "eslint_d" },
typescript = { "eslint_d" },
javascriptreact = { "eslint_d" },
typescriptreact = { "eslint_d" },
python = { "flake8" },
}
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,
})
vim.keymap.set("n", "<leader>ml", function()
lint.try_lint()
end, { desc = "Trigger linting for current file" })
end,
}

View File

@ -1,38 +1,25 @@
return { return {
"VonHeikemen/lsp-zero.nvim", 'VonHeikemen/lsp-zero.nvim',
branch = "v3.x", branch = 'v3.x',
dependencies = { dependencies = {
{ "neovim/nvim-lspconfig" }, {'neovim/nvim-lspconfig'},
{ "williamboman/mason.nvim" }, {'williamboman/mason.nvim'},
{ "williamboman/mason-lspconfig.nvim" }, {'williamboman/mason-lspconfig.nvim'},
{ "WhoIsSethDaniel/mason-tool-installer.nvim" },
}, },
config = function () config = function ()
local lsp_zero = require("lsp-zero") local lsp_zero = require('lsp-zero')
lsp_zero.on_attach(function(client, bufnr) lsp_zero.on_attach(function(client, bufnr)
-- see :help lsp-zero-keybindings -- see :help lsp-zero-keybindings
-- to learn the available actions -- to learn the available actions
lsp_zero.default_keymaps({buffer = bufnr}) lsp_zero.default_keymaps({buffer = bufnr})
end) end)
require("mason").setup({}) require('mason').setup({})
require("mason-lspconfig").setup({ require('mason-lspconfig').setup({
ensure_installed = {}, ensure_installed = {},
handlers = { handlers = {
lsp_zero.default_setup, lsp_zero.default_setup,
}, },
}) })
local mason_tool_installer = require("mason-tool-installer") end
mason_tool_installer.setup({
ensure_installed = {
"prettier", -- prettier formatter
"stylua", -- lua formatter
"isort", -- python formatter
"black", -- python formatter
"flake8", -- python linter
"eslint_d", -- js linter
},
})
end,
} }