From afe079d821f39763aa46990234a0699fb3ba5fc3 Mon Sep 17 00:00:00 2001
From: James Walmsley <james@fullfat-fs.co.uk>
Date: Sun, 11 Jul 2021 09:21:21 +0100
Subject: [PATCH] [SETTINGS] Ensure <Leader> is mapped before plugin configs
 are sourced. (#863)

---
 lua/lv-which-key/init.lua | 9 ---------
 lua/settings.lua          | 7 +++++++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index 37feca95..50583b4e 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -8,15 +8,6 @@ end
 
 which_key.setup(O.plugin.which_key.setup)
 
--- Set leader
-if O.leader_key == " " or O.leader_key == "space" then
-  vim.api.nvim_set_keymap("n", "<Space>", "<NOP>", { noremap = true, silent = true })
-  vim.g.mapleader = " "
-else
-  vim.api.nvim_set_keymap("n", O.leader_key, "<NOP>", { noremap = true, silent = true })
-  vim.g.mapleader = O.leader_key
-end
-
 local opts = O.plugin.which_key.opts
 local vopts = O.plugin.which_key.vopts
 
diff --git a/lua/settings.lua b/lua/settings.lua
index b146a50d..d797558a 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -43,6 +43,13 @@ local disabled_built_ins = {
   "spellfile_plugin",
   -- 'matchit', 'matchparen', 'shada_plugin',
 }
+
+if O.leader_key == " " or O.leader_key == "space" then
+  vim.g.mapleader = ' '
+else
+  vim.g.mapleader = O.leader_key
+end
+
 for _, plugin in pairs(disabled_built_ins) do
   vim.g["loaded_" .. plugin] = 1
 end