1 files changed, 25 insertions, 28 deletions
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 87c8514..d67871c 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -110,8 +110,8 @@ return require('packer').startup({function()
     requires = {'nvim-lua/plenary.nvim'},
     config = function()
       local nls = require('null-ls')
-      local h = require('null-ls.helpers')
-      nls.config {
+      -- local h = require('null-ls.helpers')
+      nls.setup {
         -- debug = true,
         sources = {
           nls.builtins.diagnostics.shellcheck, -- *sh
@@ -121,32 +121,29 @@ return require('packer').startup({function()
           -- nls.builtins.formatting.rustfmt, -- rust
           nls.builtins.formatting.shfmt, -- *sh
           nls.builtins.formatting.yapf, -- python
-          h.make_builtin({
-            method = nls.methods.DIAGNOSTICS,
-            filetypes = { 'go' },
-            generator_opts = {
-              command = 'sh',
-              args = {
-                '-c',
-                'golangci-lint run --fix=false --out-format=tab -E gocritic | grep ^$RELNAME',
-              },
-              to_stdin = false,
-              check_exit_code = {0, 1},
-              format = 'line',
-              on_output = h.diagnostics.from_patterns({
-                {
-                  pattern = [[(.+):(%d+):(%d+)%s+([%w%_%-]+)%s+(.*)]],
-                  groups = { 'data', 'row', 'col', 'source', 'message' },
-                }
-              })
-            },
-            factory = h.generator_factory,
-          })
-        }
-      }
-
-      require('lspconfig')['null-ls'].setup {
-        on_attach = require('lsp').my_attach
+          -- h.make_builtin({
+          --   method = nls.methods.DIAGNOSTICS,
+          --   filetypes = { 'go' },
+          --   generator_opts = {
+          --     command = 'sh',
+          --     args = {
+          --       '-c',
+          --       'golangci-lint run --fix=false --out-format=tab -E gocritic | grep ^$RELNAME',
+          --     },
+          --     to_stdin = false,
+          --     check_exit_code = {0, 1},
+          --     format = 'line',
+          --     on_output = h.diagnostics.from_patterns({
+          --       {
+          --         pattern = [[(.+):(%d+):(%d+)%s+([%w%_%-]+)%s+(.*)]],
+          --         groups = { 'data', 'row', 'col', 'source', 'message' },
+          --       }
+          --     })
+          --   },
+          --   factory = h.generator_factory,
+          -- })
+        },
+        on_attach = require('lsp').my_attach,
       }
     end} -- }}}