From 06888508be3cc8e7caa2f16d0b99864a5f97cc5f Mon Sep 17 00:00:00 2001
From: blob42 <contact@blob42.xyz>
Date: Sat, 16 Sep 2023 12:38:39 +0200
Subject: [PATCH] null-ls go.nvim load order

---
 lua/custom/plugins/configs/dapui.lua  |  7 ++++++-
 lua/custom/plugins/configs/gonvim.lua | 10 +++++-----
 lua/custom/plugins/init.lua           | 10 ++++++----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lua/custom/plugins/configs/dapui.lua b/lua/custom/plugins/configs/dapui.lua
index 729f5e1..7553301 100644
--- a/lua/custom/plugins/configs/dapui.lua
+++ b/lua/custom/plugins/configs/dapui.lua
@@ -1,4 +1,3 @@
-local dapui = require('dapui')
 
 local M = {}
 local opts = {
@@ -76,6 +75,12 @@ local opts = {
 
 
 M.setup = function()
+    local ok, dapui = pcall(require, "dapui")
+    if not ok then
+        vim.notify("missing module dapui", vim.log.levels.WARN)
+        return
+    end
+
     dapui.setup(opts)
 end
 
diff --git a/lua/custom/plugins/configs/gonvim.lua b/lua/custom/plugins/configs/gonvim.lua
index 1954e51..baeb9c7 100644
--- a/lua/custom/plugins/configs/gonvim.lua
+++ b/lua/custom/plugins/configs/gonvim.lua
@@ -1,8 +1,3 @@
-local ok, null_ls = pcall(require, 'null-ls')
-if not ok then 
-    vim.notify("missing module null-ls", vim.log.levels.WARN)
-end
-
 local dapui_cfg = require("custom.plugins.configs.dapui").opts
 
 local M = {}
@@ -29,6 +24,11 @@ local config = {
 }
 
 function M.setup()
+    local ok, null_ls = pcall(require, 'null-ls')
+    if not ok then 
+        vim.notify("missing module null-ls", vim.log.levels.WARN)
+    end
+
     require("go").setup(config)
     local gotest = require('go.null_ls').gotest()
     local gotest_codeaction = require("go.null_ls").gotest_action()
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 5e80535..c4f99c0 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -338,9 +338,10 @@ return {
 
     ["rcarriga/nvim-dap-ui"] = {
         -- tag = "*",
-        lock = true,
-        commit = "1e21b3b",
-        after = {"nvim-dap"},
+        -- lock = true,
+        -- commit = "1e21b3b",
+        -- after = {"nvim-dap"},
+        module = {"dapui"},
         config = function()
             require('custom.plugins.configs.dapui').setup()
         end
@@ -723,8 +724,9 @@ return {
 
     ["jose-elias-alvarez/null-ls.nvim"] = {
         lock = true,
+        opt = true,
+        module = {"null-ls"},
         requires = {"nvim-lua/plenary.nvim"},
-        event = "BufRead",
         setup = function()
             require('core.utils').load_mappings 'null_ls'
         end,