mirror of
https://github.com/iofq/nvim.nix.git
synced 2026-01-23 08:55:16 -06:00
Jan 24 updates
This commit is contained in:
parent
a503ddc9c4
commit
a81697463d
11 changed files with 53 additions and 48 deletions
|
|
@ -6,10 +6,13 @@ require('gitsigns').setup{
|
|||
vim.keymap.set("n", "<leader>gg", gs.preview_hunk)
|
||||
vim.keymap.set('n', '<leader>gs', gs.stage_hunk)
|
||||
vim.keymap.set('n', '<leader>gr', gs.reset_hunk)
|
||||
vim.keymap.set('v', '<leader>gs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
|
||||
vim.keymap.set('v', '<leader>gr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
|
||||
vim.keymap.set('n', '<leader>gu', gs.undo_stage_hunk)
|
||||
vim.keymap.set('n', '<leader>gS', gs.stage_buffer)
|
||||
vim.keymap.set('n', '<leader>gR', gs.reset_buffer)
|
||||
vim.keymap.set('n', '<leader>gb', function() gs.blame_line{full=true} end)
|
||||
vim.keymap.set('n', '<leader>gb', gs.toggle_current_line_blame)
|
||||
vim.keymap.set('n', '<leader>gd', gs.diffthis)
|
||||
vim.keymap.set('n', '<leader>gD', function() gs.diffthis('~') end)
|
||||
vim.keymap.set('n', '<leader>gt', gs.toggle_deleted)
|
||||
|
|
@ -24,5 +27,6 @@ require('gitsigns').setup{
|
|||
if vim.wo.diff then return '[c' end
|
||||
vim.schedule(function() gs.prev_hunk() end)
|
||||
return '<Ignore>'
|
||||
end, {expr=true}) end
|
||||
end, {expr=true})
|
||||
end
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,18 +29,15 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local opts = { buffer = ev.buf }
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
|
||||
vim.keymap.set('n', '<leader>dD', vim.lsp.buf.declaration, opts)
|
||||
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
|
||||
vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts)
|
||||
vim.keymap.set({ 'n', 'v' }, '<leader>ac', vim.lsp.buf.code_action, opts)
|
||||
vim.keymap.set("n", "<leader>dd", "<cmd>Telescope lsp_definitions<cr>", { buffer = bufnr })
|
||||
vim.keymap.set("n", "<leader>di", "<cmd>Telescope lsp_implementations<cr>", { buffer = bufnr })
|
||||
vim.keymap.set("n", "<leader>dr", "<cmd>Telescope lsp_references<cr>", { buffer = bufnr })
|
||||
vim.keymap.set("n", "<leader>dt", "<cmd>Telescope lsp_type_definitions<cr>", { buffer = bufnr })
|
||||
vim.keymap.set("n", "<leader>ds", "<cmd>Telescope lsp_document_symbols<cr>", { buffer = bufnr })
|
||||
vim.keymap.set("n", "<leader>dS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", { buffer = bufnr })
|
||||
vim.keymap.set('n', '<space>df', function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end, opts)
|
||||
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@
|
|||
require('mini.ai').setup()
|
||||
-- gc gcc
|
||||
require('mini.comment').setup()
|
||||
-- alt hjkl
|
||||
require('mini.move').setup()
|
||||
|
||||
-- Add surrounding with sa
|
||||
-- Add surrounding with sa
|
||||
-- Delete surrounding with sd.
|
||||
-- Replace surrounding with sr.
|
||||
-- Find surrounding with sf or sF (move cursor right or left).
|
||||
|
|
@ -49,7 +47,18 @@ require('mini.splitjoin').setup({
|
|||
}
|
||||
})
|
||||
|
||||
require('mini.pairs').setup()
|
||||
require('mini.pairs').setup(
|
||||
{
|
||||
modes = { insert = true, command = false, terminal = false },
|
||||
mappings = {
|
||||
['['] = { action = 'open', pair = '[]', neigh_pattern = '[^\\].' },
|
||||
['{'] = { action = 'open', pair = '{}', neigh_pattern = '[^\\].' },
|
||||
|
||||
[']'] = { action = 'close', pair = '[]', neigh_pattern = '[^\\].' },
|
||||
['}'] = { action = 'close', pair = '{}', neigh_pattern = '[^\\].' },
|
||||
},
|
||||
}
|
||||
)
|
||||
vim.cmd([[ hi MiniCursorwordCurrent ctermfg=240 ]])
|
||||
|
||||
-- f F t T
|
||||
|
|
@ -72,5 +81,9 @@ require('mini.completion').setup({
|
|||
info = { height = 25, width = 80, border = 'single' },
|
||||
signature = { height = 25, width = 80, border = 'single' },
|
||||
},
|
||||
lsp_completion = {
|
||||
source_func = 'completefunc',
|
||||
auto_setup = true,
|
||||
},
|
||||
fallback_action = "<C-x><C-n>"
|
||||
})
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@ require("nvim-treesitter.configs").setup {
|
|||
swap = {
|
||||
enable = true,
|
||||
swap_next = {
|
||||
["p]"] = "@parameter.inner",
|
||||
["A]"] = "@parameter.inner",
|
||||
},
|
||||
swap_previous = {
|
||||
["p["] = "@parameter.inner",
|
||||
["A["] = "@parameter.inner",
|
||||
},
|
||||
}, },
|
||||
incremental_selection = {
|
||||
|
|
|
|||
|
|
@ -3,12 +3,10 @@ vim.keymap.set("n", "<leader>fb", telescope.buffers, {noremap = true, silent = t
|
|||
vim.keymap.set("n", "<leader>ff", telescope.find_files, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>fg", telescope.git_files, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>fv", telescope.command_history, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader><leader>", telescope.live_grep, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>8", telescope.grep_string, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader><BS>", telescope.resume, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>fa", telescope.live_grep, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>f8", telescope.grep_string, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>f<BS>", telescope.resume, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>fs", telescope.git_status, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>fd", telescope.lsp_definitions, {noremap = true, silent = true})
|
||||
vim.keymap.set("n", "<leader>fr", telescope.lsp_references, {noremap = true, silent = true})
|
||||
|
||||
local telescope = require("telescope")
|
||||
telescope.setup({
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
require("toggleterm").setup{
|
||||
open_mapping = [[<C-\>]],
|
||||
size = vim.o.lines * 0.4
|
||||
direction = "float",
|
||||
close_on_exit = true,
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue