Преглед изворни кода

[SETTINGS] Ensure <Leader> is mapped before plugin configs are sourced. (#863)

James Walmsley пре 4 година
родитељ
комит
afe079d821
2 измењених фајлова са 7 додато и 9 уклоњено
  1. 0 9
      lua/lv-which-key/init.lua
  2. 7 0
      lua/settings.lua

+ 0 - 9
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
 

+ 7 - 0
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