diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua index fd69e20..ce199cb 100644 --- a/lua/core/mappings.lua +++ b/lua/core/mappings.lua @@ -120,10 +120,6 @@ end -- below are all plugin related mappings -M.better_escape = function() - vim.g.better_escape_shortcut = plugin_maps.better_escape.esc_insertmode or { "" } -end - M.bufferline = function() local m = plugin_maps.bufferline diff --git a/lua/plugins/configs/others.lua b/lua/plugins/configs/others.lua index 7199c89..7d06c76 100644 --- a/lua/plugins/configs/others.lua +++ b/lua/plugins/configs/others.lua @@ -40,7 +40,10 @@ M.autosave = function() end M.better_escape = function() + local m = require("core.utils").load_config().mappings.plugin.better_escape.esc_insertmode + vim.g.better_escape_interval = config.options.plugin.esc_insertmode_timeout or 300 + vim.g.better_escape_shortcut = m end M.blankline = function() diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 73fc46e..4a67097 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -166,11 +166,8 @@ return packer.startup(function() "jdhao/better-escape.vim", disable = not plugin_status.esc_insertmode, event = "InsertEnter", - config = function() - require("plugins.configs.others").better_escape() - end, setup = function() - require("core.mappings").better_escape() + require("plugins.configs.others").better_escape() end, }