From 59de298d8fc05b4ee2633cd2dfe9d517cf6f6d68 Mon Sep 17 00:00:00 2001
From: siduck <siduck@tutanota.com>
Date: Mon, 30 May 2022 12:33:46 +0530
Subject: [PATCH] fix #1155, #1149

---
 init.lua                         | 1 +
 lua/plugins/configs/whichkey.lua | 1 -
 lua/plugins/init.lua             | 5 ++---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/init.lua b/init.lua
index 1aab68f..b0d1b93 100644
--- a/init.lua
+++ b/init.lua
@@ -7,6 +7,7 @@ end
 require "core"
 require "core.utils"
 require "core.options"
+require("core.utils").load_mappings()
 
 -- setup packer + plugins
 require("core.packer").bootstrap()
diff --git a/lua/plugins/configs/whichkey.lua b/lua/plugins/configs/whichkey.lua
index 023327f..30630a2 100644
--- a/lua/plugins/configs/whichkey.lua
+++ b/lua/plugins/configs/whichkey.lua
@@ -44,7 +44,6 @@ local mapping_groups = { groups = vim.deepcopy(mappings.groups) }
 mappings.disabled = nil
 mappings.groups = nil
 
-utils.load_mappings()
 utils.load_mappings(mapping_groups)
 
 wk.setup(options)
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index e595592..613ae4b 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,4 +1,3 @@
-
 local plugins = {
 
    ["nvim-lua/plenary.nvim"] = {},
@@ -74,7 +73,7 @@ local plugins = {
       end,
       setup = function()
          require("core.utils").packer_lazy_load "gitsigns.nvim"
-      end
+      end,
    },
 
    -- lsp stuff
@@ -110,7 +109,7 @@ local plugins = {
       opt = true,
       setup = function()
          require("core.utils").packer_lazy_load "vim-matchup"
-      end
+      end,
    },
 
    ["max397574/better-escape.nvim"] = {