From 6e4c690e5d5b6212f351cc503dd05707b811abb0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 22 May 2025 08:38:49 +0100 Subject: [PATCH] Remove global formatters and linters Following commit 724753327, this removes all global formatters and linters so I can move them into project-specific flake.nix and .nvim.lua files. --- .../coding/neovim/config/plugin/conform.lua | 43 +------------------ .../coding/neovim/config/plugin/lint.lua | 11 +---- 2 files changed, 3 insertions(+), 51 deletions(-) diff --git a/modules/home-manager/coding/neovim/config/plugin/conform.lua b/modules/home-manager/coding/neovim/config/plugin/conform.lua index c2643665..733eaca4 100644 --- a/modules/home-manager/coding/neovim/config/plugin/conform.lua +++ b/modules/home-manager/coding/neovim/config/plugin/conform.lua @@ -1,46 +1,5 @@ local conform = require "conform" conform.setup { - formatters_by_ft = { - bash = { "shellcheck" }, - go = { "gofmt" }, - javascript = { "prettierd", "prettier", stop_after_first = true }, - just = { "just" }, - lua = { "stylua" }, - nix = { "nixfmt" }, - php = { "php_cs_fixer", "phpcbf", stop_after_first = true }, - terraform = { "terraform_fmt" }, - yaml = { "yamlfmt" }, - }, - - format_on_save = function(bufnr) - -- Disable with a global or buffer-local variable. - if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then - return - end - - return { - lsp_fallback = false, - quiet = true, - } - end, + formatters_by_ft = {} } - -vim.api.nvim_create_user_command("FormatDisable", function(args) - if args.bang then - -- FormatDisable! will disable formatting just for this buffer - vim.b.disable_autoformat = true - else - vim.g.disable_autoformat = true - end -end, { - desc = "Disable autoformat-on-save", - bang = true, -}) - -vim.api.nvim_create_user_command("FormatEnable", function() - vim.b.disable_autoformat = false - vim.g.disable_autoformat = false -end, { - desc = "Re-enable autoformat-on-save", -}) diff --git a/modules/home-manager/coding/neovim/config/plugin/lint.lua b/modules/home-manager/coding/neovim/config/plugin/lint.lua index f862107a..249cf0f8 100644 --- a/modules/home-manager/coding/neovim/config/plugin/lint.lua +++ b/modules/home-manager/coding/neovim/config/plugin/lint.lua @@ -1,14 +1,7 @@ local lint = require "lint" -lint.linters_by_ft = { - dockerfile = { "hadolint" }, - javascript = { "eslint_d" }, - json = { "jsonlint" }, - lua = { "luacheck" }, - markdown = { "markdownlint" }, - nix = { "nix" }, - php = { "php", "phpcs", "phpstan" }, -} +lint.linters_by_ft = {}; + local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {