From c7f83264c47241f888afeec85057b5a2f7024c7b Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Thu, 10 Feb 2022 08:47:27 +0100 Subject: more improvemments on the config, better separation, better keybinding config --- after/plugin/completition.lua | 10 +++++++--- after/plugin/gitsigns.lua | 13 +++++++++++++ after/plugin/harpoon.lua | 18 ++++++++++++------ 3 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 after/plugin/gitsigns.lua (limited to 'after/plugin') diff --git a/after/plugin/completition.lua b/after/plugin/completition.lua index 7140ca5..e1b55f6 100644 --- a/after/plugin/completition.lua +++ b/after/plugin/completition.lua @@ -1,8 +1,12 @@ +local ok, cmp = pcall(require, "cmp") +if not ok then + return +end + local lspkind = require "lspkind" +local luasnip = require "luasnip" +local cmp_autopairs = require "nvim-autopairs.completion.cmp" -local luasnip = require("luasnip") -local cmp = require "cmp" -local cmp_autopairs = require('nvim-autopairs.completion.cmp') cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } })) cmp.setup { diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua new file mode 100644 index 0000000..c8935bd --- /dev/null +++ b/after/plugin/gitsigns.lua @@ -0,0 +1,13 @@ +local ok, gitsigns = pcall(require, "gitsigns") +if not ok then + return +end + +gitsigns.setup({ + on_attach = function (bufnr) + vim.keymap.set('n', 'hs', gitsigns.stage_hunk, {buffer = bufnr} ) + vim.keymap.set('n', 'hu', gitsigns.undo_stage_hunk, {buffer = bufnr} ) + vim.keymap.set('n', 'hr', gitsigns.reset_hunk, {buffer = bufnr} ) + vim.keymap.set('n', 'hp', gitsigns.preview_hunk, {buffer = bufnr} ) + end +}) diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua index 087b29f..380b26a 100644 --- a/after/plugin/harpoon.lua +++ b/after/plugin/harpoon.lua @@ -5,10 +5,16 @@ end harpoon.setup {} -vim.api.nvim_set_keymap("n", "ss", [[ lua require("harpoon.ui").toggle_quick_menu()]], {noremap = true, silent = true, expr = false}) +vim.keymap.set('n', 'ss', require("harpoon.ui").toggle_quick_menu, {noremap = true, silent = true, expr = false}) +vim.keymap.set('n', 'sa', require("harpoon.mark").add_file, {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("n", "sa", [[ lua require("harpoon.mark").add_file()]], {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("n", "su", [[ lua require("harpoon.ui").nav_file(1)]], {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("n", "si", [[ lua require("harpoon.ui").nav_file(2)]], {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("n", "so", [[ lua require("harpoon.ui").nav_file(3)]], {noremap = true, silent = true, expr = false}) -vim.api.nvim_set_keymap("n", "sp", [[ lua require("harpoon.ui").nav_file(4)]], {noremap = true, silent = true, expr = false}) +for i = 1, 5 do + vim.keymap.set( + 'n', + string.format("%s", i), + function () + require("harpoon.ui").nav_file(i) + end, + {noremap = true, silent = true, expr = false} + ) +end -- cgit v1.2.3