iofq/nvim.nix
1
0
Fork 0
mirror of https://github.com/iofq/nvim.nix.git synced 2026-01-23 08:55:16 -06:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

add eyeliner, trouble

Browse source
This commit is contained in:
iofq 2024-08-10 14:27:25 -05:00
parent b25deb86c1
commit 3f57948360
12 changed files with 45 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nvim/plugin/diffview.lua
View file

@ -1,7 +0,0 @@
if vim.g.did_load_diffview_plugin then
return
end
vim.g.did_load_diffview_plugin = true
require('diffview').setup { use_icons = false }
vim.keymap.set('n', '<leader>gdd', vim.cmd.DiffviewOpen, { desc = '[g]it [d]iffview open' })

7
nvim/plugin/git.lua
View file

@ -1,7 +0,0 @@
if vim.g.did_load_diffview_plugin then
return
end
vim.g.did_load_diffview_plugin = true
require('diffview').setup {
use_icons = false,
}

70
nvim/plugin/gitsigns.lua
View file

@ -3,40 +3,38 @@ if vim.g.did_load_gitsigns_plugin then
end
vim.g.did_load_gitsigns_plugin = true
vim.schedule(function()
require('gitsigns').setup {
signcolumn = false,
numhl = true,
on_attach = function()
local gs = package.loaded.gitsigns
vim.keymap.set('n', '<leader>gg', gs.preview_hunk, { desc = 'git preview hunk' })
vim.keymap.set('n', '<leader>gb', function()
gs.blame_line { full = true }
end, { desc = 'git blame_line' })
vim.keymap.set('n', '<leader>gr', gs.reset_hunk, { desc = 'git reset hunk' })
vim.keymap.set('v', '<leader>gr', function()
gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') }
end, { desc = 'git reset hunk' })
-- Navigation
vim.keymap.set('n', ']g', function()
if vim.wo.diff then
return ']c'
end
vim.schedule(function()
gs.next_hunk()
end)
return '<Ignore>'
end, { expr = true })
require('gitsigns').setup {
signcolumn = false,
numhl = true,
on_attach = function()
local gs = package.loaded.gitsigns
vim.keymap.set('n', '<leader>gg', gs.preview_hunk, { desc = 'git preview hunk' })
vim.keymap.set('n', '<leader>gb', function()
gs.blame_line { full = true }
end, { desc = 'git blame_line' })
vim.keymap.set('n', '<leader>gr', gs.reset_hunk, { desc = 'git reset hunk' })
vim.keymap.set('v', '<leader>gr', function()
gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') }
end, { desc = 'git reset hunk' })
-- Navigation
vim.keymap.set('n', ']g', function()
if vim.wo.diff then
return ']c'
end
vim.schedule(function()
gs.next_hunk()
end)
return '<Ignore>'
end, { expr = true })
vim.keymap.set('n', '[g', function()
if vim.wo.diff then
return '[c'
end
vim.schedule(function()
gs.prev_hunk()
end)
return '<Ignore>'
end, { expr = true })
end,
}
end)
vim.keymap.set('n', '[g', function()
if vim.wo.diff then
return '[c'
end
vim.schedule(function()
gs.prev_hunk()
end)
return '<Ignore>'
end, { expr = true })
end,
}

6
nvim/plugin/keymaps.lua
View file

@ -8,6 +8,6 @@ vim.keymap.set('n', '<C-b>', '<C-b>zz')
vim.keymap.set('n', '<CR>', 'm0i<cr><Esc>`0', { noremap = true, silent = true })
vim.keymap.set({ 'v', 'i' }, 'wq', '<esc>l', { noremap = true, silent = true })
vim.keymap.set({ 'n', 'v', 'i' }, 'qwq', '<esc>l<cmd>wqa<CR>', { noremap = true, silent = true })
vim.keymap.set({ 'n', 'v' }, '<leader>yy', '"+y', { noremap = true, silent = true, desc = 'Yank to clip' })
vim.keymap.set({ 'n', 'v' }, '<leader>yp', '"+p', { noremap = true, silent = true, desc = 'Paste from clip' })
vim.keymap.set({ 'n', 'v' }, '<leader>yd', '"+d', { noremap = true, silent = true, desc = 'Delete to clip' })
vim.keymap.set({ 'n', 'v' }, '<leader>yy', '"*y', { noremap = true, silent = true, desc = 'Yank to clip' })
vim.keymap.set({ 'n', 'v' }, '<leader>yp', '"*p', { noremap = true, silent = true, desc = 'Paste from clip' })
vim.keymap.set({ 'n', 'v' }, '<leader>yd', '"*d', { noremap = true, silent = true, desc = 'Delete to clip' })

2
nvim/plugin/lsp.lua
View file

@ -16,9 +16,9 @@ lspconfig.gopls.setup {
lspconfig.pyright.setup { capabilities = capabilities }
lspconfig.nil_ls.setup { capabilities = capabilities }
vim.keymap.set('n', '<leader>de', vim.diagnostic.open_float, { desc = 'Toggle diagnostic' })
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Prev diagnostic' })
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Next diagnostic' })
vim.keymap.set('n', '<leader>de', vim.diagnostic.open_float, { desc = 'Toggle diagnostic' })
vim.diagnostic.config {
virtual_text = true,

2
nvim/plugin/mini.lua
View file

@ -53,8 +53,6 @@ require('mini.splitjoin').setup {
require('mini.pairs').setup()
vim.cmd([[ hi MiniCursorwordCurrent ctermfg=240 ]])
-- f F t T
require('mini.jump').setup()
require('mini.jump2d').setup {
mappings = { start_jumping = '<leader>s' },
}

2
nvim/plugin/misc.lua
View file

@ -18,3 +18,5 @@ require('toggleterm').setup {
require('which-key').setup {
preset = 'helix',
}
require('trouble').setup {}
require('eyeliner').setup {}

7
nvim/plugin/statuscol.lua
View file

@ -1,7 +0,0 @@
if vim.g.did_load_diffview_plugin then
return
end
vim.g.did_load_diffview_plugin = true
require('diffview').setup {
use_icons = false,
}

1
nvim/plugin/treesitter.lua
View file

@ -63,4 +63,5 @@ require('nvim-treesitter.configs').setup {
require('treesitter-context').setup {
max_lines = 3,
min_window_height = 50
}