summaryrefslogtreecommitdiff
path: root/init.lua
diff options
context:
space:
mode:
authorIan S. Pringle <[email protected]>2021-06-26 14:31:40 -0400
committerGitHub <[email protected]>2021-06-26 14:31:40 -0400
commit2cf8580eb79b24a3d565aba8bb3305417811f2c8 (patch)
treeab370fb21d3144fda0597958a803582efade6fb1 /init.lua
parent60175ee0d67a12cc617c68aad983ed4e12d98ad9 (diff)
Updated where leader key is set and made var in lv-settings (#474)
- Setting leader-key in the init.lua file. You want to set the leader as soon as possible so that it's the same everywhere. With the leader being set in the lua/lv-which-key/init.lua it resulted in mappings that used `<leader>` in the lua/keymappings.lua mapping the the defualt leader-key of `\` - Added the O.leader_key to the lv-settings.lua file so the leader-key can be set there, which seems to make more sense. - Added handling for when the leader-key is `<Space>`. This could be made more robust to include other special keys, but I don't think many/any of the other special keys would be used as a leader-key (ie <BS>, <CR>, <Tab>, <Esc>, <Up|Down|Right|Left>, etc.) Co-authored-by: Christian Chiarulli <[email protected]>
Diffstat (limited to 'init.lua')
-rw-r--r--init.lua12
1 files changed, 10 insertions, 2 deletions
diff --git a/init.lua b/init.lua
index 2ef7203d..f241f264 100644
--- a/init.lua
+++ b/init.lua
@@ -1,5 +1,15 @@
require('lv-globals')
vim.cmd('luafile '..CONFIG_PATH..'/lv-settings.lua')
+
+-- 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
+
require('settings')
require('lv-gitblame')
require('lv-matchup')
@@ -34,8 +44,6 @@ if O.extras then
require('lv-vimtex')
end
-
-
-- TODO is there a way to do this without vimscript
vim.cmd('source '..CONFIG_PATH..'/vimscript/functions.vim')