From e8315399fb7a337ac496c776048a38599716bdb9 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 6 Oct 2024 17:11:48 +0200 Subject: checkpoint --- after/plugin/gitsigns.lua | 17 ++++++++++++----- after/plugin/telescope.lua | 14 +++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'after/plugin') diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua index b781fb6..87dd7f4 100644 --- a/after/plugin/gitsigns.lua +++ b/after/plugin/gitsigns.lua @@ -1,4 +1,5 @@ -require("gitsigns").setup({ +local gitsigns = require("gitsigns") +gitsigns.setup({ signs = { add = { text = "▎" }, change = { text = "▎" }, @@ -7,12 +8,18 @@ require("gitsigns").setup({ changedelete = { text = "▎" }, untracked = { text = "▎" }, }, + numhl = false, + attach_to_untracked = true, + update_debounce = 0, on_attach = function(buffer) - local gs = package.loaded.gitsigns local map = vim.keymap.set - -- stylua: ignore start - map("n", "]g", gs.next_hunk, { desc = "Next git hunk" }) - map("n", "[g", gs.prev_hunk, { desc = "Previous git hunk" }) + map("n", "]g", gitsigns.next_hunk, { desc = "Next git hunk" }) + map("n", "[g", gitsigns.prev_hunk, { desc = "Previous git hunk" }) + map("n", " gd", gitsigns.toggle_deleted, { desc="Toggle deleted"}) + map("n", " gr", gitsigns.reset_hunk, { desc="Reset hunk"}) + map("n", " gs", gitsigns.stage_hunk, { desc="Stage hunk"}) + map("n", " gu", gitsigns.undo_stage_hunk, { desc="Undo stage hunk"}) + map("n", " gb", gitsigns.blame, { desc="Blame"}) end, }) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua index 720e157..c77e464 100644 --- a/after/plugin/telescope.lua +++ b/after/plugin/telescope.lua @@ -24,16 +24,16 @@ require("telescope").setup({ }) local builtin = require("telescope.builtin") -map("n", " tf", builtin.find_files) +map("n", " ff", builtin.find_files) map("n", " bl", builtin.buffers) -map("n", "", builtin.git_files) -map("n", " tw", builtin.live_grep) -map("n", " th", builtin.help_tags, { desc = "Find help tags" }) +map("n", " fp", builtin.git_files) +map("n", " fw", builtin.live_grep) +map("n", " fh", builtin.help_tags) -- symbols -map("n", " tse", "lua require'telescope.builtin'.symbols{ sources = {'emoji', 'gitmoji'} }") -map("n", " tsn", "lua require'telescope.builtin'.symbols{ sources = {'nerd'} }") -map("n", " tsj", "lua require'telescope.builtin'.symbols{ sources = {'julia'} }") +map("n", " fe", "lua require'telescope.builtin'.symbols{ sources = {'emoji', 'gitmoji'} }") +map("n", " fn", "lua require'telescope.builtin'.symbols{ sources = {'nerd'} }") +map("n", " fj", "lua require'telescope.builtin'.symbols{ sources = {'julia'} }") require("telescope").load_extension("ui-select") require("telescope").load_extension("fzf") -- cgit v1.2.3