diff --git a/lua/core/utils.lua b/lua/core/utils.lua index 63063a88..6676e74a 100644 --- a/lua/core/utils.lua +++ b/lua/core/utils.lua @@ -129,8 +129,6 @@ nvchad.no_WhichKey_map = function() end end end - - require("plugins.configs.others").misc_mappings() end -- load plugin after entering vim ui diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua index 13d74baa..5ef73a56 100644 --- a/lua/plugins/configs/lspconfig.lua +++ b/lua/plugins/configs/lspconfig.lua @@ -14,7 +14,7 @@ local _default_opts = win.default_opts win.default_opts = function(options) local opts = _default_opts(options) - opts.border = "double" + opts.border = "single" return opts end diff --git a/lua/plugins/configs/others.lua b/lua/plugins/configs/others.lua index 5a5e3bbd..433560b8 100644 --- a/lua/plugins/configs/others.lua +++ b/lua/plugins/configs/others.lua @@ -211,16 +211,4 @@ M.gitsigns = function() } end -M.misc_mappings = function() - local map = nvchad.map - - -- Allow moving the cursor through wrapped lines with j, k, and - -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/ - -- empty mode is same as using :map - -- also don't use g[j|k] when in operator pending mode, so it doesn't alter d, y or c behaviour - map("", "j", 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', { expr = true }) - map("", "k", 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', { expr = true }) - map("", "", 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', { expr = true }) - map("", "", 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', { expr = true }) -end return M diff --git a/lua/plugins/configs/whichkey.lua b/lua/plugins/configs/whichkey.lua index b561d6a2..e6037cd1 100644 --- a/lua/plugins/configs/whichkey.lua +++ b/lua/plugins/configs/whichkey.lua @@ -55,10 +55,9 @@ local options = { }, } -require("plugins.configs.others").misc_mappings() - local mappings = nvchad.load_config().mappings local mapping_groups = { groups = vim.deepcopy(mappings.groups) } + mappings.disabled = nil mappings.groups = nil diff --git a/lua/plugins/packerInit.lua b/lua/plugins/packerInit.lua index 50a29f57..fbf26c7c 100644 --- a/lua/plugins/packerInit.lua +++ b/lua/plugins/packerInit.lua @@ -30,7 +30,7 @@ end local options = { display = { open_fn = function() - return require("packer.util").float { border = "double" } + return require("packer.util").float { border = "single" } end, }, git = {