Fix merge

lua/custom/configs/lspconfig.lua

@@ -22,3 +22,5 @@ lspconfig.gopls.setup{
     }
   }
 }
+
+return lspconfig

lua/custom/configs/none-ls.lua

@@ -1,4 +1,4 @@
-local none_ls = require("none-ls")
+local none_ls = require("null-ls")
 local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 
 
@@ -18,7 +18,7 @@ local opts = {
         group = augroup,
         buffer= bufnr,
         callback = function()
-          vim.lsp.buf.form({ bufnr = bufnr})
+          vim.lsp.buf.format({bufnr=bufnr})
         end,
       })
     end

lua/custom/mappings.lua

@@ -3,7 +3,7 @@ local M = {}
 M.gopher = {
   plugins = true,
   n = {
-    ["<leader>gsj"] = {
+    ["<leader>gtj"] = {
       "<cmd> GoTagAdd json <CR>",
       "Add json tag to struct"
     },

lua/custom/plugins.lua

@@ -25,17 +25,15 @@ local plugins = {
   
   -- Go plugins
   {
-    "olexsmir/gopher.nvim",
+    "ray-x/go.nvim",
-    ft = "go",
+    config = function()
-    config = function (_, opts)
+      require("go").setup()
-      require("gopher").setup(opts)
       require("core.utils").load_mappings("gopher")
     end,
-    build = function ()
+    event = {"CmdlineEnter"},
-      vim.cmd [[silent! GoInstallDeps]]
+    ft = {"go", 'gomod'},
-    end,
+    build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
   },
-
   -- Markdown plugins
   {
     'ixru/nvim-markdown',