From 100331949d82bc6ec97024daeb9e0eda92d6a931 Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 17 Mar 2024 23:46:09 +0100 Subject: [PATCH] Added new plugins and modified remaps --- lua/taken/core/remaps.lua | 12 ++++++------ lua/taken/plugins/barbecue.lua | 10 ++++++++++ lua/taken/plugins/bufferline.lua | 8 ++++---- lua/taken/plugins/harpoon.lua | 12 ++++++------ lua/taken/plugins/nvimtree.lua | 8 ++++---- lua/taken/plugins/sessionmanager.lua | 4 ++-- lua/taken/plugins/telescope.lua | 16 ++++++++-------- lua/taken/plugins/treesitter-textobjects.lua | 11 ----------- 8 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 lua/taken/plugins/barbecue.lua diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua index 93c5799..c12a51e 100644 --- a/lua/taken/core/remaps.lua +++ b/lua/taken/core/remaps.lua @@ -68,24 +68,24 @@ local vn = { for map, command in pairs(v) do if command.desc then - set("v", map, command[1], { desc = command.desc }) + set("v", map, command[1], { desc = command.desc, silent = true }) else - set("v", map, command[1]) + set("v", map, command[1], { silent = true }) end end for map, command in pairs(n) do if command.desc then - set("n", map, command[1], { desc = command.desc }) + set("n", map, command[1], { desc = command.desc, silent = true }) else - set("n", map, command[1]) + set("n", map, command[1], { silent = true }) end end for map, command in pairs(vn) do if command.desc then - set({ "v", "n" }, map, command[1], { desc = command.desc }) + set({ "v", "n" }, map, command[1], { desc = command.desc, silent = true }) else - set({ "v", "n" }, map, command[1]) + set({ "v", "n" }, map, command[1], { silent = true }) end end diff --git a/lua/taken/plugins/barbecue.lua b/lua/taken/plugins/barbecue.lua new file mode 100644 index 0000000..aa93b40 --- /dev/null +++ b/lua/taken/plugins/barbecue.lua @@ -0,0 +1,10 @@ +return { + "utilyre/barbecue.nvim", + name = "barbecue", + version = "*", + dependencies = { + "SmiteshP/nvim-navic", + "nvim-tree/nvim-web-devicons", + }, + config = true, +} diff --git a/lua/taken/plugins/bufferline.lua b/lua/taken/plugins/bufferline.lua index 6b904f3..ad25622 100644 --- a/lua/taken/plugins/bufferline.lua +++ b/lua/taken/plugins/bufferline.lua @@ -3,11 +3,11 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = "nvim-tree/nvim-web-devicons", - enabled = false, + -- enabled = false, config = function() - vim.keymap.set("n", "", ":BufferLineCycleNext ", { desc = "Cycle tabs" }) - vim.keymap.set("n", "bn", ":BufferLineCycleNext ", { desc = "Next tab" }) - vim.keymap.set("n", "bp", ":BufferLineCyclePrev ", { desc = "NextPrevious tab" }) + vim.keymap.set("n", "", ":BufferLineCycleNext ", { silent = true, desc = "Cycle tabs" }) + vim.keymap.set("n", "bn", ":BufferLineCycleNext ", { silent = true, desc = "Next tab" }) + vim.keymap.set("n", "bp", ":BufferLineCyclePrev ", { silent = true, desc = "NextPrevious tab" }) local bufferline = require("bufferline") diff --git a/lua/taken/plugins/harpoon.lua b/lua/taken/plugins/harpoon.lua index 536a185..5bd5ea8 100644 --- a/lua/taken/plugins/harpoon.lua +++ b/lua/taken/plugins/harpoon.lua @@ -10,22 +10,22 @@ return { vim.keymap.set("n", "a", function() harpoon:list():append() - end) + end, { silent = true, desc = "Append current file to harpoon" }) vim.keymap.set("n", "th", function() harpoon.ui:toggle_quick_menu(harpoon:list()) - end) + end, { silent = true, desc = "Toggle harpoon quick menu" }) vim.keymap.set("n", "", function() harpoon:list():select(1) - end) + end, { silent = true, desc = "Jumps to item 1 in the list" }) vim.keymap.set("n", "", function() harpoon:list():select(2) - end) + end, { silent = true, desc = "Jumps to item 2 in the list" }) vim.keymap.set("n", "", function() harpoon:list():select(3) - end) + end, { silent = true, desc = "Jumps to item 3 in the list" }) vim.keymap.set("n", "", function() harpoon:list():select(4) - end) + end, { silent = true, desc = "Jumps to item 4 in the list" }) end, } diff --git a/lua/taken/plugins/nvimtree.lua b/lua/taken/plugins/nvimtree.lua index 55dc650..0b5bc86 100644 --- a/lua/taken/plugins/nvimtree.lua +++ b/lua/taken/plugins/nvimtree.lua @@ -30,12 +30,12 @@ return { }, }) - vim.keymap.set("n", "n", ":NvimTreeToggle ") - vim.keymap.set("n", "e", ":NvimTreeFocus ") - vim.keymap.set("n", "r", ":NvimTreeRefresh ") + vim.keymap.set("n", "n", ":NvimTreeToggle ", { silent = true }) + vim.keymap.set("n", "e", ":NvimTreeFocus ", { silent = true }) + vim.keymap.set("n", "r", ":NvimTreeRefresh ", { silent = true }) vim.keymap.set("n", "tr", function() require("nvim-tree.api").tree.change_root(vim.fn.getcwd()) - end, { desc = "Change root dir to current dir" }) + end, { silent = true, desc = "Change root dir to current dir" }) local autocmd = vim.api.nvim_create_autocmd local augroup = vim.api.nvim_create_augroup diff --git a/lua/taken/plugins/sessionmanager.lua b/lua/taken/plugins/sessionmanager.lua index 0c3f935..af2413d 100644 --- a/lua/taken/plugins/sessionmanager.lua +++ b/lua/taken/plugins/sessionmanager.lua @@ -25,7 +25,7 @@ return { autoload_mode = smconfig.AutoloadMode.Disabled, }) - vim.keymap.set("n", "ps", "Telescope neovim-project discover") - vim.keymap.set("n", "ph", "Telescope neovim-project history") + vim.keymap.set("n", "ps", "Telescope neovim-project discover", { silent = true }) + vim.keymap.set("n", "ph", "Telescope neovim-project history", { silent = true }) end, } diff --git a/lua/taken/plugins/telescope.lua b/lua/taken/plugins/telescope.lua index 7f497f3..2725441 100644 --- a/lua/taken/plugins/telescope.lua +++ b/lua/taken/plugins/telescope.lua @@ -53,13 +53,13 @@ return { telescope.load_extension("file_browser") telescope.load_extension("fzf") - vim.keymap.set("n", "ff", "Telescope find_files", { desc = "Find files" }) - vim.keymap.set("n", "fg", "Telescope live_grep", { desc = "Live grep" }) - vim.keymap.set("n", "fB", "Telescope builtin", { desc = "Find builtins" }) - vim.keymap.set("n", "fh", "Telescope help_tags", { desc = "Help tags" }) - vim.keymap.set("n", "fd", "Telescope file_browser", { desc = "File browser" }) - vim.keymap.set("n", "fr", "Telescope reloader", { desc = "Reload config" }) - vim.keymap.set("n", "fc", "Telescope commands", { desc = "Commands" }) + vim.keymap.set("n", "ff", "Telescope find_files", { silent = true, desc = "Find files" }) + vim.keymap.set("n", "fg", "Telescope live_grep", { silent = true, desc = "Live grep" }) + vim.keymap.set("n", "fB", "Telescope builtin", { silent = true, desc = "Find builtins" }) + vim.keymap.set("n", "fh", "Telescope help_tags", { silent = true, desc = "Help tags" }) + vim.keymap.set("n", "fd", "Telescope file_browser", { silent = true, desc = "File browser" }) + vim.keymap.set("n", "fr", "Telescope reloader", { silent = true, desc = "Reload config" }) + vim.keymap.set("n", "fc", "Telescope commands", { silent = true, desc = "Commands" }) vim.keymap.set("n", "bb", function() builtin.buffers({ @@ -73,6 +73,6 @@ return { return true end, }) - end, { desc = "Find buffers" }) + end, { silent = true, desc = "Find buffers" }) end, } diff --git a/lua/taken/plugins/treesitter-textobjects.lua b/lua/taken/plugins/treesitter-textobjects.lua index edadeb8..b44d5de 100644 --- a/lua/taken/plugins/treesitter-textobjects.lua +++ b/lua/taken/plugins/treesitter-textobjects.lua @@ -98,16 +98,5 @@ return { }, }, }) - -- local ts_repeat_move = require("nvim-treesitter.textobjects.repeatable_move") - -- - -- -- vim way: ; goes to the direction you were moving. - -- vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move) - -- vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_opposite) - -- - -- -- Optionally, make builtin f, F, t, T also repeatable with ; and , - -- vim.keymap.set({ "n", "x", "o" }, "f", ts_repeat_move.builtin_f) - -- vim.keymap.set({ "n", "x", "o" }, "F", ts_repeat_move.builtin_F) - -- vim.keymap.set({ "n", "x", "o" }, "t", ts_repeat_move.builtin_t) - -- vim.keymap.set({ "n", "x", "o" }, "T", ts_repeat_move.builtin_T) end, }