init.lua @ 5ff381d

M lua/configs/lsp/attach.lua

@@ -1,18 +1,19 @@
 return function(client, bufnr)
   vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
-  client.resolved_capabilities.document_formatting = false
-  client.resolved_capabilities.document_range_formatting = false
+  client.server_capabilities.documentFormattingProvider = false
 
-  local function buf_map(...)
-    vim.api.nvim_buf_set_keymap(bufnr, "n", ...)
+  local function buf_map(from, to)
+    vim.api.nvim_buf_set_keymap(bufnr, "n", from, to, {
+      noremap = true,
+      silent = true,
+    })
   end
 
-  local opts = { noremap = true, silent = true }
-  buf_map("K", "<cmd>lua vim.lsp.buf.hover()<cr>", opts)
-  buf_map("gd", "<cmd>Telescope lsp_definitions<cr>", opts)
-  buf_map("gD", "<cmd>lua vim.lsp.buf.declaration()<cr>", opts)
-  buf_map("gr", "<cmd>Telescope lsp_references<cr>", opts)
-  buf_map("gi", "<cmd>Telescope lsp_implementations<cr>", opts)
-  buf_map("gs", "<cmd>lua vim.lsp.buf.signature_help()<cr>", opts)
-  buf_map("gl", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<cr>", opts)
+  buf_map("K", "<cmd>lua vim.lsp.buf.hover()<cr>")
+  buf_map("gd", "<cmd>Telescope lsp_definitions<cr>")
+  buf_map("gD", "<cmd>lua vim.lsp.buf.declaration()<cr>")
+  buf_map("gr", "<cmd>Telescope lsp_references<cr>")
+  buf_map("gi", "<cmd>Telescope lsp_implementations<cr>")
+  buf_map("gs", "<cmd>lua vim.lsp.buf.signature_help()<cr>")
+  buf_map("gl", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<cr>")
 end

M lua/configs/lsp/null-ls.lua

@@ -7,5 +7,10 @@ null_ls.setup {
   sources = {
     formatting.stylua,
     diagnostic.selene,
+    formatting.black,
+    diagnostic.flake8,
+    diagnostic.golangci_lint,
+    formatting.gofumpt,
+    formatting.goimports,
   },
 }

M lua/core/keymaps.lua

@@ -52,7 +52,7 @@
 -- lsp
 map("n", "<leader>la", "<cmd>Telescope lsp_code_actions<cr>")
 map("n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<cr>")
-map("n", "<leader>lf", "<cmd>lua vim.lsp.buf.formatting()<cr>")
+map("n", "<leader>lf", "<cmd>lua vim.lsp.buf.format {async = true}<cr>")
 map("n", "<leader>ls", "<cmd>Telescope lsp_document_symbols<cr>")
 map("n", "<leader>lj", "<cmd>lua vim.diagnostic.goto_next()<cr>")
 map("n", "<leader>lk", "<cmd>lua vim.diagnostic.goto_prev()<cr>")

M lua/plugins.lua

@@ -95,7 +95,7 @@ event = "BufRead",
     config = u.get_config "configs.lsp",
     requires = {
       { "williamboman/nvim-lsp-installer", wants = "nvim-lspconfig" },
-      { "jose-elias-alvarez/null-ls.nvim", module = "null-ls" },
+      { "jose-elias-alvarez/null-ls.nvim", wants = "nvim-lspconfig" },
       { "folke/lua-dev.nvim", module = "lua-dev" },
     },
   }