From f26a884830028ffd4b25a6b3becf599a2b5ce2eb Mon Sep 17 00:00:00 2001 From: piecka Date: Wed, 4 Sep 2024 10:53:55 +0200 Subject: [PATCH] removed old keymaps from keymap.lua and ported them to the specific plugin files --- lua/pika/core/keymaps.lua | 58 -------------------------------- lua/pika/plugins/comment-box.lua | 46 ++++++++++++++++++++----- lua/pika/plugins/lf.lua | 4 +-- lua/pika/plugins/lorem_ipsum.lua | 24 +++++++------ lua/pika/plugins/neo-tree.lua | 4 +++ 5 files changed, 57 insertions(+), 79 deletions(-) diff --git a/lua/pika/core/keymaps.lua b/lua/pika/core/keymaps.lua index 3376d19..6761c35 100644 --- a/lua/pika/core/keymaps.lua +++ b/lua/pika/core/keymaps.lua @@ -16,9 +16,6 @@ map("n", "", "nohlsearch") map("n", "", "gcc", { desc = "comment toggle", remap = true }) map("v", "", "gc", { desc = "comment toggle", remap = true }) --- ─< telesnip >──────────────────────────────────────────────────────────────────────── --- map("n", "S", ":Snippets", { desc = "Snippets with telescope", remap = true }) - -- ─< cmd line >──────────────────────────────────────────────────────────────────────── vim.api.nvim_set_keymap("n", ":", "FineCmdline", { noremap = true }) map("n", "T", "FineCmdline") @@ -33,7 +30,6 @@ map("i", "", "", { desc = "move left" }) map("i", "", "", { desc = "move right" }) map("i", "", "", { desc = "move down" }) map("i", "", "", { desc = "move up" }) --- ───────────────────────────────────< Add yours here >─────────────────────────────────── map("n", ";", ":", { desc = "CMD enter command mode" }) map("i", "jk", "") @@ -43,12 +39,6 @@ map("v", "", "") map("n", "x", "bd!") --- ─< Activate color plugin >─────────────────────────────────────────────────────────── -map("n", "C", "ColorizerToggle") - ---─< Toggle NvimTree >───────────────────────────────────────────────────────────────── -map("n", "e", ":Neotree toggle", { noremap = true, silent = true, desc = "[e]xplorer" }) - -- ─< Disable arrow keys in normal mode >─────────────────────────────────────────────── map("n", "", 'echo "Use h to move!!"') map("n", "", 'echo "Use l to move!!"') @@ -64,57 +54,9 @@ map("n", "k", "", { desc = "Move focus to the upper window" }) map("n", "q", vim.cmd.q) map("n", "s", vim.cmd.w) --- ─< Comment-Box mappings >──────────────────────────────────────────────────────────── -map("n", "cd", "CBd", { noremap = true, silent = true, desc = "[c]ommentbox [d]elete" }) -map("v", "cd", "CBd", { noremap = true, silent = true, desc = "[c]ommentbox [d]elete" }) - -map("n", "cy", "CBy", { noremap = true, silent = true, desc = "[y]ank content of Commentbox" }) -map("v", "cy", "CBy", { noremap = true, silent = true, desc = "[y]ank content of Commentbox" }) - -map("n", "cb", "CBlabox1", { noremap = true, silent = true, desc = "[c]reate comment [b]ox" }) -map("v", "cb", "CBlabox1", { noremap = true, silent = true, desc = "[c]reate comment [b]ox" }) -map( - "n", - "cB", - "CBcabox1", - { noremap = true, silent = true, desc = "[c]reate comment [b]ox (centered)" } -) - -map( - "v", - "cB", - "CBcabox1", - { noremap = true, silent = true, desc = "[c]reate comment [b]ox (centered)" } -) -map("n", "cc", "CBllbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment" }) -map("v", "cc", "CBllbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment" }) -map("n", "cC", "CBclbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment (C)entered" }) -map("v", "cC", "CBclbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment (C)entered" }) - -map("n", "cl", "CBllline8", { noremap = true, silent = true, desc = "[c]reate comment [l]ine" }) -map("n", "cL", "CBlcline8", { noremap = true, silent = true, desc = "[c]reate comment [L]ine" }) - -- ─< rename word under cursor >─────────────────────────────────────────────────────────── map("n", "R", [[:%s/\<\>//gI]]) --- ─< LoremIpsum generator >──────────────────────────────────────────────────────────── -map("n", "L", ":LoremIpsum ") - -- window management map("n", "sv", "v", { desc = "Split window vertically" }) -- split window vertically map("n", "sh", "s", { desc = "Split window horizontally" }) -- split window horizontally - --- ─< genvim keymaps (ai enhanced, coding!) >─────────────────────────────────────────── -map({ "n", "v" }, "a", ":Gen") - --- ╭──────────────────────╮ --- │ ZEN Mode Keybindings │ --- ╰──────────────────────╯ - -local api = vim.api - -api.nvim_set_keymap("n", "zn", ":TZNarrow", {}) -api.nvim_set_keymap("v", "zn", ":'<,'>TZNarrow", {}) -api.nvim_set_keymap("n", "zf", ":TZFocus", {}) -api.nvim_set_keymap("n", "zm", ":TZMinimalist", {}) -api.nvim_set_keymap("n", "za", ":TZAtaraxis", {}) diff --git a/lua/pika/plugins/comment-box.lua b/lua/pika/plugins/comment-box.lua index 99929f3..bba9c90 100644 --- a/lua/pika/plugins/comment-box.lua +++ b/lua/pika/plugins/comment-box.lua @@ -1,10 +1,40 @@ return { - "LudoPinelli/comment-box.nvim", - lazy = false, - opts = { - comment_style = "line", - doc_width = 90, -- width of the document - box_width = 75, -- width of the boxes - line_width = 120, -- width of the lines - }, + "LudoPinelli/comment-box.nvim", + lazy = false, + opts = { + comment_style = "line", + doc_width = 90, -- width of the document + box_width = 75, -- width of the boxes + line_width = 120, -- width of the lines + }, + -- ─< Comment-Box mappings >──────────────────────────────────────────────────────────── + vim.keymap.set("n", "cd", "CBd", { noremap = true, silent = true, desc = "[c]ommentbox [d]elete" }), + vim.keymap.set("v", "cd", "CBd", { noremap = true, silent = true, desc = "[c]ommentbox [d]elete" }), + + vim.keymap.set("n", "cy", "CBy", { noremap = true, silent = true, desc = "[y]ank content of Commentbox" }), + vim.keymap.set("v", "cy", "CBy", { noremap = true, silent = true, desc = "[y]ank content of Commentbox" }), + + vim.keymap.set("n", "cb", "CBlabox1", { noremap = true, silent = true, desc = "[c]reate comment [b]ox" }), + vim.keymap.set("v", "cb", "CBlabox1", { noremap = true, silent = true, desc = "[c]reate comment [b]ox" }), + vim.keymap.set( + "n", + "cB", + "CBcabox1", + { noremap = true, silent = true, desc = "[c]reate comment [b]ox (centered)" } + ), + + vim.keymap.set( + "v", + "cB", + "CBcabox1", + { noremap = true, silent = true, desc = "[c]reate comment [b]ox (centered)" } + ), + vim.keymap.set("n", "cc", "CBllbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment" }), + vim.keymap.set("v", "cc", "CBllbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment" }), + vim.keymap.set("n", "cC", "CBclbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment (C)entered" }), + vim.keymap.set("v", "cC", "CBclbox14", { noremap = true, silent = true, desc = "[c]reate [c]omment (C)entered" }), + + vim.keymap.set("n", "cl", "CBllline8", { noremap = true, silent = true, desc = "[c]reate comment [l]ine" }), + vim.keymap.set("n", "cL", "CBlcline8", { noremap = true, silent = true, desc = "[c]reate comment [L]ine" }), + } diff --git a/lua/pika/plugins/lf.lua b/lua/pika/plugins/lf.lua index 361cc5b..0f99d90 100644 --- a/lua/pika/plugins/lf.lua +++ b/lua/pika/plugins/lf.lua @@ -15,9 +15,9 @@ return { [""] = "vsplit", [""] = "tab drop", }, - winblend = 10, -- psuedotransparency level + winblend = 30, -- psuedotransparency level direction = "float", -- window type: float horizontal vertical - border = "shadow", -- border kind: single double shadow curved + border = "curved", -- border kind: single double shadow curved escape_quit = true, -- map escape to the quit command (so it doesn't go into a meta normal mode) focus_on_open = true, -- focus the current file when opening Lf (experimental) mappings = true, -- whether terminal buffer mapping is enabled diff --git a/lua/pika/plugins/lorem_ipsum.lua b/lua/pika/plugins/lorem_ipsum.lua index 4e3101d..c5cbb0e 100644 --- a/lua/pika/plugins/lorem_ipsum.lua +++ b/lua/pika/plugins/lorem_ipsum.lua @@ -1,13 +1,15 @@ return { - "derektata/lorem.nvim", - config = function() - require("lorem").setup({ - sentenceLength = { -- custom configuration - words_per_sentence = 6, - sentences_per_paragraph = 4, - }, - comma_chance = 0.3, -- 30% chance to insert a comma - max_commas_per_sentence = 2, -- maximum 2 commas per sentence - }) - end, + "derektata/lorem.nvim", + config = function() + require("lorem").setup({ + sentenceLength = { -- custom configuration + words_per_sentence = 6, + sentences_per_paragraph = 4, + }, + comma_chance = 0.3, -- 30% chance to insert a comma + max_commas_per_sentence = 2, -- maximum 2 commas per sentence + }) + end, + -- ─< LoremIpsum generator >──────────────────────────────────────────────────────────── + vim.keymap.set("n", "L", ":LoremIpsum ") } diff --git a/lua/pika/plugins/neo-tree.lua b/lua/pika/plugins/neo-tree.lua index 9fca28f..9ec9e0b 100644 --- a/lua/pika/plugins/neo-tree.lua +++ b/lua/pika/plugins/neo-tree.lua @@ -112,4 +112,8 @@ return { "3rd/image.nvim", }, }, + +-- ─< Toggle NvimTree >───────────────────────────────────────────────────────────────── +vim.keymap.set("n", "e", ":Neotree toggle", { noremap = true, silent = true, desc = "[e]xplorer" }) + }