Compare commits
8 commits
be0cc6b971
...
c6735f3912
Author | SHA1 | Date | |
---|---|---|---|
Bruno BELANYI | c6735f3912 | ||
Bruno BELANYI | 3438290e32 | ||
Bruno BELANYI | 82f49f1389 | ||
Bruno BELANYI | 5918a0b9e6 | ||
Bruno BELANYI | a7c542784c | ||
Bruno BELANYI | 280829b54f | ||
Bruno BELANYI | 5ffe2653c0 | ||
Bruno BELANYI | 5592a120a4 |
|
@ -1,15 +0,0 @@
|
||||||
local wk = require("which-key")
|
|
||||||
local telescope_builtin = require("telescope.builtin")
|
|
||||||
|
|
||||||
local keys = {
|
|
||||||
f = {
|
|
||||||
name = "Fuzzy finder",
|
|
||||||
b = { telescope_builtin.buffers, "Open buffers" },
|
|
||||||
f = { telescope_builtin.git_files, "Git tracked files" },
|
|
||||||
F = { telescope_builtin.find_files, "Files" },
|
|
||||||
g = { telescope_builtin.live_grep, "Grep string" },
|
|
||||||
G = { telescope_builtin.grep_string, "Grep string under cursor" },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
wk.register(keys, { prefix = "<leader>" })
|
|
|
@ -1,30 +0,0 @@
|
||||||
local wk = require("which-key")
|
|
||||||
|
|
||||||
local motions = {
|
|
||||||
["]m"] = "Next method start",
|
|
||||||
["]M"] = "Next method end",
|
|
||||||
["]S"] = "Next statement start",
|
|
||||||
["]]"] = "Next class start",
|
|
||||||
["]["] = "Next class end",
|
|
||||||
["[m"] = "Previous method start",
|
|
||||||
["[M"] = "Previous method end",
|
|
||||||
["[S"] = "Previous statement start",
|
|
||||||
["[["] = "Previous class start",
|
|
||||||
["[]"] = "Previous class end",
|
|
||||||
}
|
|
||||||
|
|
||||||
local objects = {
|
|
||||||
["aa"] = "a parameter",
|
|
||||||
["ia"] = "inner parameter",
|
|
||||||
["ab"] = "a block",
|
|
||||||
["ib"] = "inner block",
|
|
||||||
["ac"] = "a class",
|
|
||||||
["ic"] = "inner class",
|
|
||||||
["af"] = "a function",
|
|
||||||
["if"] = "inner function",
|
|
||||||
["ak"] = "a comment",
|
|
||||||
["aS"] = "a statement",
|
|
||||||
}
|
|
||||||
|
|
||||||
wk.register(motions, { mode = "n" })
|
|
||||||
wk.register(objects, { mode = "o" })
|
|
|
@ -7,17 +7,28 @@ local numbertoggle = vim.api.nvim_create_augroup("numbertoggle", { clear = true
|
||||||
vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
|
vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
group = numbertoggle,
|
group = numbertoggle,
|
||||||
command = "if &nu | setlocal rnu | endif",
|
callback = function()
|
||||||
|
if vim.opt.number:get() then
|
||||||
|
vim.opt.relativenumber = true
|
||||||
|
end
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter", "WinLeave" }, {
|
vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter", "WinLeave" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
group = numbertoggle,
|
group = numbertoggle,
|
||||||
command = "if &nu | setlocal nornu | endif",
|
callback = function()
|
||||||
|
if vim.opt.number:get() then
|
||||||
|
vim.opt.relativenumber = false
|
||||||
|
end
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Never show the sign column in a terminal buffer
|
-- Never show the sign column in a terminal buffer
|
||||||
vim.api.nvim_create_autocmd({ "TermOpen" }, {
|
vim.api.nvim_create_autocmd({ "TermOpen" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
group = numbertoggle,
|
group = numbertoggle,
|
||||||
command = "setlocal nonu nornu",
|
callback = function()
|
||||||
|
vim.opt.number = false
|
||||||
|
vim.opt.relativenumber = false
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
local gitsigns = require("gitsigns")
|
local gitsigns = require("gitsigns")
|
||||||
|
local utils = require("ambroisie.utils")
|
||||||
local wk = require("which-key")
|
local wk = require("which-key")
|
||||||
|
|
||||||
--- Transform `f` into a function which acts on the current visual selection
|
--- Transform `f` into a function which acts on the current visual selection
|
||||||
|
@ -11,16 +12,14 @@ local function make_visual(f)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function nav_hunk(dir)
|
local function nav_hunk(dir)
|
||||||
return function()
|
if vim.wo.diff then
|
||||||
if vim.wo.diff then
|
local map = {
|
||||||
local map = {
|
prev = "[c",
|
||||||
prev = "[c",
|
next = "]c",
|
||||||
next = "]c",
|
}
|
||||||
}
|
vim.cmd.normal({ map[dir], bang = true })
|
||||||
vim.cmd.normal({ map[dir], bang = true })
|
else
|
||||||
else
|
gitsigns.nav_hunk(dir)
|
||||||
gitsigns.nav_hunk(dir)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -29,12 +28,14 @@ gitsigns.setup({
|
||||||
-- Show the blame quickly
|
-- Show the blame quickly
|
||||||
delay = 100,
|
delay = 100,
|
||||||
},
|
},
|
||||||
|
-- Work-around for https://github.com/lewis6991/gitsigns.nvim/issues/929
|
||||||
|
signs_staged_enable = false,
|
||||||
})
|
})
|
||||||
|
|
||||||
local keys = {
|
local keys = {
|
||||||
-- Navigation
|
-- Navigation
|
||||||
["[c"] = { nav_hunk("prev"), "Previous hunk/diff" },
|
["[c"] = { utils.partial(nav_hunk, "prev"), "Previous hunk/diff" },
|
||||||
["]c"] = { nav_hunk("next"), "Next hunk/diff" },
|
["]c"] = { utils.partial(nav_hunk, "next"), "Next hunk/diff" },
|
||||||
|
|
||||||
-- Commands
|
-- Commands
|
||||||
["<leader>g"] = {
|
["<leader>g"] = {
|
||||||
|
@ -42,8 +43,7 @@ local keys = {
|
||||||
-- Actions
|
-- Actions
|
||||||
b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" },
|
b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" },
|
||||||
d = { gitsigns.diffthis, "Diff buffer" },
|
d = { gitsigns.diffthis, "Diff buffer" },
|
||||||
-- stylua: ignore
|
D = { utils.partial(gitsigns.diffthis, "~"), "Diff buffer against last commit" },
|
||||||
D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" },
|
|
||||||
g = { "<cmd>Git<CR>", "Git status" },
|
g = { "<cmd>Git<CR>", "Git status" },
|
||||||
h = { gitsigns.toggle_deleted, "Show deleted hunks" },
|
h = { gitsigns.toggle_deleted, "Show deleted hunks" },
|
||||||
L = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
|
L = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
local telescope = require("telescope")
|
local telescope = require("telescope")
|
||||||
|
local telescope_builtin = require("telescope.builtin")
|
||||||
|
local wk = require("which-key")
|
||||||
|
|
||||||
telescope.setup({
|
telescope.setup({
|
||||||
defaults = {
|
defaults = {
|
||||||
|
@ -22,3 +24,16 @@ telescope.setup({
|
||||||
|
|
||||||
telescope.load_extension("fzf")
|
telescope.load_extension("fzf")
|
||||||
telescope.load_extension("lsp_handlers")
|
telescope.load_extension("lsp_handlers")
|
||||||
|
|
||||||
|
local keys = {
|
||||||
|
f = {
|
||||||
|
name = "Fuzzy finder",
|
||||||
|
b = { telescope_builtin.buffers, "Open buffers" },
|
||||||
|
f = { telescope_builtin.git_files, "Git tracked files" },
|
||||||
|
F = { telescope_builtin.find_files, "Files" },
|
||||||
|
g = { telescope_builtin.live_grep, "Grep string" },
|
||||||
|
G = { telescope_builtin.grep_string, "Grep string under cursor" },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
wk.register(keys, { prefix = "<leader>" })
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
local ts_config = require("nvim-treesitter.configs")
|
local ts_config = require("nvim-treesitter.configs")
|
||||||
|
|
||||||
ts_config.setup({
|
ts_config.setup({
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
|
@ -14,16 +15,16 @@ ts_config.setup({
|
||||||
-- Jump to matching text objects
|
-- Jump to matching text objects
|
||||||
lookahead = true,
|
lookahead = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
["aa"] = "@parameter.outer",
|
["aa"] = { query = "@parameter.outer", desc = "a parameter" },
|
||||||
["ia"] = "@parameter.inner",
|
["ia"] = { query = "@parameter.inner", desc = "inner parameter" },
|
||||||
["ab"] = "@block.outer",
|
["ab"] = { query = "@block.outer", desc = "a block" },
|
||||||
["ib"] = "@block.inner",
|
["ib"] = { query = "@block.inner", desc = "inner block" },
|
||||||
["ac"] = "@class.outer",
|
["ac"] = { query = "@class.outer", desc = "a class" },
|
||||||
["ic"] = "@class.inner",
|
["ic"] = { query = "@class.inner", desc = "inner class" },
|
||||||
["af"] = "@function.outer",
|
["af"] = { query = "@function.outer", desc = "a function" },
|
||||||
["if"] = "@function.inner",
|
["if"] = { query = "@function.inner", desc = "inner function" },
|
||||||
["ak"] = "@comment.outer",
|
["ak"] = { query = "@comment.outer", desc = "a comment" },
|
||||||
["aS"] = "@statement.outer",
|
["aS"] = { query = "@statement.outer", desc = "a statement" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
move = {
|
move = {
|
||||||
|
@ -31,22 +32,22 @@ ts_config.setup({
|
||||||
-- Add to jump list
|
-- Add to jump list
|
||||||
set_jumps = true,
|
set_jumps = true,
|
||||||
goto_next_start = {
|
goto_next_start = {
|
||||||
["]m"] = "@function.outer",
|
["]m"] = { query = "@function.outer", desc = "Next method start" },
|
||||||
["]S"] = "@statement.outer",
|
["]S"] = { query = "@statement.outer", desc = "Next statement start" },
|
||||||
["]]"] = "@class.outer",
|
["]]"] = { query = "@class.outer", desc = "Next class start" },
|
||||||
},
|
},
|
||||||
goto_next_end = {
|
goto_next_end = {
|
||||||
["]M"] = "@function.outer",
|
["]M"] = { query = "@function.outer", desc = "Next method end" },
|
||||||
["]["] = "@class.outer",
|
["]["] = { query = "@class.outer", desc = "Next class end" },
|
||||||
},
|
},
|
||||||
goto_previous_start = {
|
goto_previous_start = {
|
||||||
["[m"] = "@function.outer",
|
["[m"] = { query = "@function.outer", desc = "Previous method start" },
|
||||||
["[S"] = "@statement.outer",
|
["[S"] = { query = "@statement.outer", desc = "Previous statement start" },
|
||||||
["[["] = "@class.outer",
|
["[["] = { query = "@class.outer", desc = "Previous class start" },
|
||||||
},
|
},
|
||||||
goto_previous_end = {
|
goto_previous_end = {
|
||||||
["[M"] = "@function.outer",
|
["[M"] = { query = "@function.outer", desc = "Previous method end" },
|
||||||
["[]"] = "@class.outer",
|
["[]"] = { query = "@class.outer", desc = "Previous class end" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -4,17 +4,23 @@ local signtoggle = vim.api.nvim_create_augroup("signtoggle", { clear = true })
|
||||||
vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "WinEnter" }, {
|
vim.api.nvim_create_autocmd({ "BufEnter", "FocusGained", "WinEnter" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
group = signtoggle,
|
group = signtoggle,
|
||||||
command = "setlocal signcolumn=yes",
|
callback = function()
|
||||||
|
vim.opt.signcolumn = "yes"
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "WinLeave" }, {
|
vim.api.nvim_create_autocmd({ "BufLeave", "FocusLost", "WinLeave" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
group = signtoggle,
|
group = signtoggle,
|
||||||
command = "setlocal signcolumn=yes",
|
callback = function()
|
||||||
|
vim.opt.signcolumn = "no"
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Never show the sign column in a terminal buffer
|
-- Never show the sign column in a terminal buffer
|
||||||
vim.api.nvim_create_autocmd({ "TermOpen" }, {
|
vim.api.nvim_create_autocmd({ "TermOpen" }, {
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
group = signtoggle,
|
group = signtoggle,
|
||||||
command = "setlocal signcolumn=no",
|
callback = function()
|
||||||
|
vim.opt.signcolumn = "no"
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue