chore: use guard for lint & format

BBboy01 · May 28, 2024 · 0ae89fd · 0ae89fd
1 parent 18fa40e
commit 0ae89fd
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 60 deletions.
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -8,38 +8,38 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
   "crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" },
   "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" },
-  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
+  "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" },
   "galaxyline.nvim": { "branch": "main", "commit": "20f5f750002532a35193f55cd499074fc97d933d" },
   "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
+  "guard-collection": { "branch": "main", "commit": "dfc07dccb865263a22907f9e1783306a8c6f1fd1" },
+  "guard.nvim": { "branch": "main", "commit": "0dca2a98e9aa67ca8ffdf6ca170fcbe050f53406" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
+  "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
   "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" },
-  "lspsaga.nvim": { "branch": "main", "commit": "0e2e116ade87034b2983ba0d5460af731fb1fc28" },
-  "mini.surround": { "branch": "main", "commit": "c52aa751daf62d4a9e6ee24c4a91882ef6842f99" },
+  "lspsaga.nvim": { "branch": "main", "commit": "200256d256ca596812b2ee6374244bb4dfe6974e" },
+  "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" },
   "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
   "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" },
-  "none-ls.nvim": { "branch": "main", "commit": "2236d2bf621b64ccbceebc452137b25ecc7f6228" },
   "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "953607cac7d923a3bf8608af372d2a30466efa7e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
-  "nvim-tree.lua": { "branch": "master", "commit": "4215f33da55cf93163c5f429ec6f73af86be08c2" },
-  "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "582064092cff170331064b7d198a5b97cb261fca" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" },
+  "nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" },
+  "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" },
   "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
   "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
   "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "849803e0a687c6ef7c9a0d305bd4d441017b8abf" },
-  "schemastore.nvim": { "branch": "main", "commit": "9a5992a881583d886bfbb46631a09f736f0fae50" },
-  "solarized-osaka.nvim": { "branch": "main", "commit": "0083cb237870d3da7ea4b566c8932a8e8dc209cb" },
+  "schemastore.nvim": { "branch": "main", "commit": "931f9f3b7b60ec976159cb01b4a40da3829ac2fd" },
+  "solarized-osaka.nvim": { "branch": "main", "commit": "a2a435aa0e6088ccc0d7c3aa2813c10570d90c87" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "4122e146d199c0d6d1cfb359c76bc1250d522460" },
-  "telescope.nvim": { "branch": "master", "commit": "c2ce039188e22288449e43b77710036e69a45a70" },
+  "telescope.nvim": { "branch": "master", "commit": "2df52609a1632de5d77a0b2416db6ad9cf32e463" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }
 }
diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua
@@ -268,59 +268,45 @@ return {
   },
 
   {
-    'nvimtools/none-ls.nvim',
-    event = 'VeryLazy',
-    commit = '2236d2bf621b64ccbceebc452137b25ecc7f6228',
-    config = function()
-      local null_ls = require('null-ls')
-      null_ls.setup({
-        sources = {
-          null_ls.builtins.diagnostics.eslint.with({
-            diagnostics_format = '[eslint] #{m}\n(#{c})',
-          }),
-          null_ls.builtins.diagnostics.fish,
-        },
-      })
-    end,
-  },
-
-  {
-    'stevearc/conform.nvim',
+    'nvimdev/guard.nvim',
+    dependencies = {
+      'nvimdev/guard-collection',
+    },
     keys = {
       {
         '<Leader>f',
-        function()
-          require('conform').format()
-        end,
+        '<cmd>GuardFmt<cr>',
         desc = 'Format current buffer',
       },
     },
-    opts = {
-      notify_on_error = false,
-      formatters_by_ft = {
-        lua = { 'stylua' },
-        go = { 'gofmt' },
-        rust = { 'rustfmt' },
-        toml = { 'dprint' },
-        javascript = { 'prettier' },
-        javascriptreact = { 'prettier' },
-        typescript = { 'prettier' },
-        typescriptreact = { 'prettier' },
-        vue = { 'prettier' },
-        css = { 'prettier' },
-        scss = { 'prettier' },
-        less = { 'prettier' },
-        html = { 'prettier' },
-        json = { 'prettier' },
-        jsonc = { 'prettier' },
-        yaml = { 'prettier' },
-        markdown = { 'prettier' },
-        ['markdown.mdx'] = { 'prettier' },
-        graphql = { 'prettier' },
-        handlebars = { 'prettier' },
-        -- ["*"] = { "cspell" },
-      },
-    },
+    config = function()
+      local ft = require('guard.filetype')
+      local formatter = require('guard-collection.formatter')
+      local linter = require('guard-collection.linter')
+
+      ft('lua'):fmt(formatter.stylua):lint(linter.selene)
+
+      ft('go'):fmt(formatter.gofmt):lint(linter.golangci_lint)
+
+      ft('sh'):fmt(formatter.shfmt):lint(linter.shellcheck)
+
+      ft('fish'):fmt(formatter.fish_indent)
+
+      ft('rust'):fmt(formatter.rustfmt)
+
+      ft('toml'):fmt(formatter.dprint)
+
+      ft('typescript,javascript,typescriptreact,javascriptreact,vue'):fmt(formatter.prettier):lint(linter.eslint)
+
+      ft('css,scss'):fmt(formatter.prettier):lint(linter.stylelint)
+
+      ft('html,markdown,json,jsonc,yaml'):fmt(formatter.prettier)
+
+      require('guard').setup({
+        fmt_on_save = false,
+        lsp_as_default_formatter = true,
+      })
+    end,
   },
 
   {