diff options
Diffstat (limited to '.config/nvim/lua/custom/plugins')
| -rw-r--r-- | .config/nvim/lua/custom/plugins/conform.lua | 24 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/mason.lua | 14 | ||||
| -rw-r--r-- | .config/nvim/lua/custom/plugins/nvim-lint.lua | 78 |
3 files changed, 58 insertions, 58 deletions
diff --git a/.config/nvim/lua/custom/plugins/conform.lua b/.config/nvim/lua/custom/plugins/conform.lua index 973e5dc..2610884 100644 --- a/.config/nvim/lua/custom/plugins/conform.lua +++ b/.config/nvim/lua/custom/plugins/conform.lua @@ -3,27 +3,27 @@ return { event = { 'BufWritePre' }, cmd = { 'ConformInfo' }, keys = { - { '<leader>ft', '<cmd>FormatToggle<cr>', desc = '[F]ormat [T]oggle Globally' }, + { '<leader>ft', '<cmd>FormatToggle<cr>', desc = '[F]ormat [T]oggle Globally' }, { '<leader>fT', '<cmd>FormatToggle!<cr>', desc = '[F]ormat [T]oggle Locally' }, - { '<leader>ff', '<cmd>Format<cr>', desc = '[F]ormat [F]ile' }, - { '<leader>f', '<cmd>Format<cr><esc>', desc = '[F]ormat', mode = 'v' }, + { '<leader>ff', '<cmd>Format<cr>', desc = '[F]ormat [F]ile' }, + { '<leader>f', '<cmd>Format<cr><esc>', desc = '[F]ormat', mode = 'v' }, }, ---@module "conform" ---@type conform.setupOpts opts = { formatters_by_ft = { - -- ['lua'] = { 'stylua' }, + ['lua'] = { 'stylua' }, -- ['c'] = { 'clang-format' }, -- ['python'] = { 'isort', 'black' }, -- ['rust'] = { 'rustfmt' }, - -- ['go'] = { 'gofumpt', 'goimports-reviser' }, - -- ['markdown'] = { 'prettierd', 'prettier', stop_after_first = true }, - -- ['yaml'] = { 'prettierd' }, - -- ['json'] = { 'jq' }, - -- ['html'] = { 'prettierd', 'prettier', stop_after_first = true }, - -- ['css'] = { 'prettierd', 'prettier', stop_after_first = true }, - -- ['javascript'] = { 'prettierd', 'prettier', stop_after_first = true }, - -- ['typescript'] = { 'prettierd', 'prettier', stop_after_first = true }, + ['go'] = { 'gofumpt', 'goimports-reviser' }, + ['markdown'] = { 'prettierd', 'prettier', stop_after_first = true }, + ['yaml'] = { 'prettierd' }, + ['json'] = { 'jq' }, + ['html'] = { 'prettierd', 'prettier', stop_after_first = true }, + ['css'] = { 'prettierd', 'prettier', stop_after_first = true }, + ['javascript'] = { 'prettierd', 'prettier', stop_after_first = true }, + ['typescript'] = { 'prettierd', 'prettier', stop_after_first = true }, }, format_on_save = function(bufnr) -- Disable with a global or buffer local variable diff --git a/.config/nvim/lua/custom/plugins/mason.lua b/.config/nvim/lua/custom/plugins/mason.lua index ca4cb32..c42ebc0 100644 --- a/.config/nvim/lua/custom/plugins/mason.lua +++ b/.config/nvim/lua/custom/plugins/mason.lua @@ -24,14 +24,14 @@ return { -- 'black', -- python formatter -- 'isort', -- python formatter for imports -- 'flake8', -- python linter - -- 'gofumpt', -- go formatter + 'gofumpt', -- go formatter -- 'golangci-lint', -- go linter - -- 'prettierd', -- multi-lang formatter - -- 'prettier', -- prettierd but slower, used as a fallback - -- 'jq', -- json formatter - -- 'jsonlint', -- json linter - -- 'shellcheck', -- bash linter - -- 'beautysh', -- shell formatter + 'prettierd', -- multi-lang formatter + 'prettier', -- prettierd but slower, used as a fallback + 'jq', -- json formatter + 'jsonlint', -- json linter + 'shellcheck', -- bash linter + 'beautysh', -- shell formatter }, }, }, diff --git a/.config/nvim/lua/custom/plugins/nvim-lint.lua b/.config/nvim/lua/custom/plugins/nvim-lint.lua index b9b0316..7bb3a16 100644 --- a/.config/nvim/lua/custom/plugins/nvim-lint.lua +++ b/.config/nvim/lua/custom/plugins/nvim-lint.lua @@ -1,41 +1,41 @@ return { - -- 'mfussenegger/nvim-lint', - -- lazy = false, - -- config = function() - -- local lint = require('lint') - -- lint.linters_by_ft = { - -- c = { 'clangtidy' }, - -- cpp = { 'clangtidy' }, - -- go = { 'golangcilint' }, - -- python = { 'flake8' }, - -- json = { 'jsonlint' }, - -- bash = { 'shellcheck' }, - -- } - -- - -- vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave', 'TextChanged', 'TextChangedI' }, { - -- group = vim.api.nvim_create_augroup('nvim-lint', { clear = true }), - -- callback = function() - -- require('lint').try_lint() - -- end, - -- }) - -- - -- -- NOTE: most if not all of clangt-idy warnings are - -- -- also reported by clangd, so this function filters clang-tidy warnings - -- -- to avoid duplication of warnings - -- local clangtidy_parser = lint.linters.clangtidy.parser - -- lint.linters.clangtidy.parser = function(output, bufnr, linter_cwd) - -- local diagnostics = clangtidy_parser(output, bufnr, linter_cwd) - -- diagnostics = vim.tbl_filter(function(diagnostic) - -- if diagnostic.severity == vim.diagnostic.severity.WARN then - -- return false - -- end - -- if diagnostic.severity == vim.diagnostic.severity.ERROR then - -- return false - -- end - -- - -- return true - -- end, diagnostics) - -- return diagnostics - -- end - -- end, + 'mfussenegger/nvim-lint', + lazy = false, + config = function() + local lint = require('lint') + lint.linters_by_ft = { + -- c = { 'clangtidy' }, + -- cpp = { 'clangtidy' }, + go = { 'golangcilint' }, + -- python = { 'flake8' }, + json = { 'jsonlint' }, + bash = { 'shellcheck' }, + } + + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave', 'TextChanged', 'TextChangedI' }, { + group = vim.api.nvim_create_augroup('nvim-lint', { clear = true }), + callback = function() + require('lint').try_lint() + end, + }) + + -- NOTE: most if not all of clangt-idy warnings are + -- also reported by clangd, so this function filters clang-tidy warnings + -- to avoid duplication of warnings + -- local clangtidy_parser = lint.linters.clangtidy.parser + -- lint.linters.clangtidy.parser = function(output, bufnr, linter_cwd) + -- local diagnostics = clangtidy_parser(output, bufnr, linter_cwd) + -- diagnostics = vim.tbl_filter(function(diagnostic) + -- if diagnostic.severity == vim.diagnostic.severity.WARN then + -- return false + -- end + -- if diagnostic.severity == vim.diagnostic.severity.ERROR then + -- return false + -- end + -- + -- return true + -- end, diagnostics) + -- return diagnostics + -- end + end, } |