From 0006a7d21c2f2c69101e13ffbd42b505ce359bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Fri, 17 Nov 2023 00:42:27 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(nvim):=20check=20if=20cinnam?= =?UTF-8?q?on=20plugin=20is=20loaded=20before=20overwriting=20movement=20k?= =?UTF-8?q?eys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lua/config/keymaps.lua | 130 ++++++++++++++-------------- 1 file changed, 66 insertions(+), 64 deletions(-) diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 59f3a117..cb6b7bb3 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -59,83 +59,85 @@ map("x", "g/", "/\\%V", { silent = false, desc = "Search inside visual sele map("x", "*", [[y/\V=escape(@", '/\')]]) map("x", "#", [[y?\V=escape(@", '?\')]]) --- DEFAULT_KEYMAPS: +if package.loaded["cinnamon"] then + -- DEFAULT_KEYMAPS: --- Half-window movements: -map({ "n", "x" }, "", "lua Scroll('', 1, 1)") -map({ "n", "x" }, "", "lua Scroll('', 1, 1)") + -- Half-window movements: + map({ "n", "x" }, "", "lua Scroll('', 1, 1)") + map({ "n", "x" }, "", "lua Scroll('', 1, 1)") --- Page movements: -map({ "n", "x" }, "", "lua Scroll('', 1, 1)") -map({ "n", "x" }, "", "lua Scroll('', 1, 1)") -map({ "n", "x" }, "", "lua Scroll('', 1, 1)") -map({ "n", "x" }, "", "lua Scroll('', 1, 1)") + -- Page movements: + map({ "n", "x" }, "", "lua Scroll('', 1, 1)") + map({ "n", "x" }, "", "lua Scroll('', 1, 1)") + map({ "n", "x" }, "", "lua Scroll('', 1, 1)") + map({ "n", "x" }, "", "lua Scroll('', 1, 1)") --- EXTRA_KEYMAPS: + -- EXTRA_KEYMAPS: --- Start/end of file and line number movements: -map({ "n", "x" }, "gg", "lua Scroll('gg')") -map({ "n", "x" }, "G", "lua Scroll('G', 0, 1)") + -- Start/end of file and line number movements: + map({ "n", "x" }, "gg", "lua Scroll('gg')") + map({ "n", "x" }, "G", "lua Scroll('G', 0, 1)") --- Start/end of line: -map({ "n", "x" }, "0", "lua Scroll('0')") -map({ "n", "x" }, "^", "lua Scroll('^')") -map({ "n", "x" }, "$", "lua Scroll('$', 0, 1)") + -- Start/end of line: + map({ "n", "x" }, "0", "lua Scroll('0')") + map({ "n", "x" }, "^", "lua Scroll('^')") + map({ "n", "x" }, "$", "lua Scroll('$', 0, 1)") --- Paragraph movements: -map({ "n", "x" }, "{", "lua Scroll('{')") -map({ "n", "x" }, "}", "lua Scroll('}')") + -- Paragraph movements: + map({ "n", "x" }, "{", "lua Scroll('{')") + map({ "n", "x" }, "}", "lua Scroll('}')") --- Previous/next search result: -map("n", "n", "lua Scroll('n', 1)") -map("n", "N", "lua Scroll('N', 1)") -map("n", "*", "lua Scroll('*', 1)") -map("n", "#", "lua Scroll('#', 1)") -map("n", "g*", "lua Scroll('g*', 1)") -map("n", "g#", "lua Scroll('g#', 1)") + -- Previous/next search result: + map("n", "n", "lua Scroll('n', 1)") + map("n", "N", "lua Scroll('N', 1)") + map("n", "*", "lua Scroll('*', 1)") + map("n", "#", "lua Scroll('#', 1)") + map("n", "g*", "lua Scroll('g*', 1)") + map("n", "g#", "lua Scroll('g#', 1)") --- Previous/next cursor location: -map("n", "", "lua Scroll('', 1)") -map("n", "", "lua Scroll('1', 1)") + -- Previous/next cursor location: + map("n", "", "lua Scroll('', 1)") + map("n", "", "lua Scroll('1', 1)") --- Screen scrolling: -map("n", "zz", "lua Scroll('zz', 0, 1)") -map("n", "zt", "lua Scroll('zt', 0, 1)") -map("n", "zb", "lua Scroll('zb', 0, 1)") -map("n", "z.", "lua Scroll('z.', 0, 1)") -map("n", "z", "lua Scroll('zt^', 0, 1)") -map("n", "z-", "lua Scroll('z-', 0, 1)") -map("n", "z^", "lua Scroll('z^', 0, 1)") -map("n", "z+", "lua Scroll('z+', 0, 1)") -map("n", "", "lua Scroll('', 0, 1)") -map("n", "", "lua Scroll('', 0, 1)") + -- Screen scrolling: + map("n", "zz", "lua Scroll('zz', 0, 1)") + map("n", "zt", "lua Scroll('zt', 0, 1)") + map("n", "zb", "lua Scroll('zb', 0, 1)") + map("n", "z.", "lua Scroll('z.', 0, 1)") + map("n", "z", "lua Scroll('zt^', 0, 1)") + map("n", "z-", "lua Scroll('z-', 0, 1)") + map("n", "z^", "lua Scroll('z^', 0, 1)") + map("n", "z+", "lua Scroll('z+', 0, 1)") + map("n", "", "lua Scroll('', 0, 1)") + map("n", "", "lua Scroll('', 0, 1)") --- Horizontal screen scrolling: -map("n", "zH", "lua Scroll('zH')") -map("n", "zL", "lua Scroll('zL')") -map("n", "zs", "lua Scroll('zs')") -map("n", "ze", "lua Scroll('ze')") -map("n", "zh", "lua Scroll('zh', 0, 1)") -map("n", "zl", "lua Scroll('zl', 0, 1)") + -- Horizontal screen scrolling: + map("n", "zH", "lua Scroll('zH')") + map("n", "zL", "lua Scroll('zL')") + map("n", "zs", "lua Scroll('zs')") + map("n", "ze", "lua Scroll('ze')") + map("n", "zh", "lua Scroll('zh', 0, 1)") + map("n", "zl", "lua Scroll('zl', 0, 1)") --- EXTENDED_KEYMAPS: + -- EXTENDED_KEYMAPS: --- Up/down movements: -map({ "n", "x" }, "k", "lua Scroll('k', 0, 1)") -map({ "n", "x" }, "j", "lua Scroll('j', 0, 1)") -map({ "n", "x" }, "", "lua Scroll('k', 0, 1)") -map({ "n", "x" }, "", "lua Scroll('j', 0, 1)") + -- Up/down movements: + map({ "n", "x" }, "k", "lua Scroll('k', 0, 1)") + map({ "n", "x" }, "j", "lua Scroll('j', 0, 1)") + map({ "n", "x" }, "", "lua Scroll('k', 0, 1)") + map({ "n", "x" }, "", "lua Scroll('j', 0, 1)") --- Left/right movements: -map({ "n", "x" }, "h", "lua Scroll('h', 0, 1)") -map({ "n", "x" }, "l", "lua Scroll('l', 0, 1)") -map({ "n", "x" }, "", "lua Scroll('h', 0, 1)") -map({ "n", "x" }, "", "lua Scroll('l', 0, 1)") + -- Left/right movements: + map({ "n", "x" }, "h", "lua Scroll('h', 0, 1)") + map({ "n", "x" }, "l", "lua Scroll('l', 0, 1)") + map({ "n", "x" }, "", "lua Scroll('h', 0, 1)") + map({ "n", "x" }, "", "lua Scroll('l', 0, 1)") --- LSP_KEYMAPS: + -- LSP_KEYMAPS: --- LSP go-to-definition: -map("n", "gd", "lua Scroll('definition')") + -- LSP go-to-definition: + map("n", "gd", "lua Scroll('definition')") --- LSP go-to-declaration: -map("n", "gD", "lua Scroll('declaration')") + -- LSP go-to-declaration: + map("n", "gD", "lua Scroll('declaration')") +end