mirror of
https://github.com/iofq/nvim.nix.git
synced 2026-01-23 08:55:16 -06:00
add a few plugins like neoclip, markvieww
This commit is contained in:
parent
3f57948360
commit
bdaba979ac
14 changed files with 76 additions and 40 deletions
|
|
@ -1,4 +1,20 @@
|
|||
vim.keymap.set('n', '<leader>x', '"rd', { remap = true, silent = true })
|
||||
vim.cmd('colorscheme terafox')
|
||||
vim.api.nvim_set_hl(0, 'TabLineSel', { ctermbg=none, underline = true})
|
||||
vim.api.nvim_set_hl(0, 'TabLine', { ctermbg=none, underline = false})
|
||||
|
||||
vim.keymap.set('n', '<leader>aa', '<cmd>AerialToggle!<CR>', { desc = 'Toggle Aerial' })
|
||||
vim.keymap.set('n', '<leader>nb', vim.cmd.DiffviewOpen, { noremap = true, desc = '[g]it [d]iffview open' })
|
||||
vim.keymap.set('n', '<leader>t', "<cmd>Trouble diagnostics toggle focus=true filter.buf=0<CR>", { noremap = true, desc = 'Trouble diagnostics' })
|
||||
vim.keymap.set('n', '<leader>de', "<cmd>Trouble diagnostics toggle focus=true filter.buf=0<CR>", { noremap = true, desc = 'Trouble diagnostics' })
|
||||
|
||||
vim.api.nvim_set_hl(0, 'EyelinerPrimary', { underline = true })
|
||||
vim.api.nvim_set_hl(0, 'EyelinerSecondary', { underline = true })
|
||||
|
||||
local ts = require("telescope")
|
||||
ts.load_extension("aerial")
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>fs',
|
||||
ts.extensions.aerial.aerial,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find treesitter objects' }
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
-- vim settings ++ mini.nvim.basics
|
||||
----------------------------------------
|
||||
vim.opt.backspace = 'indent,eol,start'
|
||||
vim.opt.clipboard = 'unnamedplus'
|
||||
vim.opt.completeopt = 'menuone'
|
||||
vim.opt.expandtab = true -- insert tabs as spaces
|
||||
vim.opt.inccommand = 'split' -- incremental live completion
|
||||
|
|
@ -18,7 +19,6 @@ vim.opt.swapfile = false
|
|||
vim.opt.tabstop = 2 -- 2 space tabs are based
|
||||
vim.opt.updatetime = 250 -- decrease update time
|
||||
vim.opt.virtualedit = 'onemore'
|
||||
|
||||
vim.g.fzf_layout = { window = { width = 0.9, height = 0.6 } }
|
||||
|
||||
-- no highlight floats
|
||||
|
|
|
|||
|
|
@ -4,10 +4,13 @@ end
|
|||
vim.g.did_load_aerial_plugin = true
|
||||
|
||||
require('aerial').setup {
|
||||
default_direction = 'left',
|
||||
autojump = true,
|
||||
on_attach = function(bufnr)
|
||||
vim.keymap.set('n', '{', '<cmd>AerialPrev<CR>', { buffer = bufnr })
|
||||
vim.keymap.set('n', '}', '<cmd>AerialNext<CR>', { buffer = bufnr })
|
||||
vim.keymap.set('n', '[[', '<cmd>AerialPrev<CR>', { buffer = bufnr })
|
||||
vim.keymap.set('n', ']]', '<cmd>AerialNext<CR>', { buffer = bufnr })
|
||||
end,
|
||||
close_autonatic_events = {
|
||||
unfocus,
|
||||
switch_buffer,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ cmp.setup {
|
|||
['<C-j>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-k>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['q'] = cmp.mapping.abort(),
|
||||
['<esc>'] = cmp.mapping.abort(),
|
||||
['<C-Space>'] = cmp.mapping.confirm { select = true }, -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
},
|
||||
sources = cmp.config.sources({
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
vim.keymap.set('n', 'gr', 'gT', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', 'tt', vim.cmd.tabnext, { silent = true })
|
||||
vim.keymap.set('n', 'tr', vim.cmd.tabprev, { silent = true })
|
||||
vim.keymap.set('n', 'gt', vim.cmd.bnext, { silent = true })
|
||||
vim.keymap.set('n', 'gr', vim.cmd.bprev, { noremap = true, silent = true })
|
||||
vim.keymap.set('n', 'gq', vim.cmd.bdelete, { silent = true })
|
||||
vim.keymap.set('n', 'n', 'nzz', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', 'N', 'Nzz', { noremap = true, silent = true })
|
||||
vim.keymap.set('n', '<C-d>', '<C-d>zz')
|
||||
vim.keymap.set('n', '<C-u>', '<C-u>zz')
|
||||
vim.keymap.set('n', '<C-f>', '<C-f>zz')
|
||||
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' })
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ lspconfig.nil_ls.setup { capabilities = capabilities }
|
|||
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,13 @@ vim.g.did_load_lualine_plugin = true
|
|||
vim.schedule(function()
|
||||
require('lualine').setup {
|
||||
globalstatus = true,
|
||||
extensions = { 'fugitive', 'fzf', 'toggleterm', 'quickfix' },
|
||||
extensions = { 'oil', 'trouble', 'aerial', 'fzf', 'toggleterm', 'quickfix' },
|
||||
sections = {
|
||||
lualine_x = {'filetype'}
|
||||
},
|
||||
tabline = {
|
||||
lualine_a = {'buffers'},
|
||||
lualine_z = {'tabs'},
|
||||
}
|
||||
}
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ require('mini.pairs').setup()
|
|||
vim.cmd([[ hi MiniCursorwordCurrent ctermfg=240 ]])
|
||||
|
||||
require('mini.jump2d').setup {
|
||||
mappings = { start_jumping = '<leader>s' },
|
||||
mappings = { start_jumping = '<leader>S' },
|
||||
}
|
||||
|
||||
indent = require('mini.indentscope')
|
||||
|
|
@ -63,3 +63,5 @@ indent.setup {
|
|||
draw = { delay = 0 },
|
||||
}
|
||||
indent.gen_animation.none()
|
||||
|
||||
require('mini.icons').setup()
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ require('toggleterm').setup {
|
|||
open_mapping = [[<C-\>]],
|
||||
direction = 'float',
|
||||
close_on_exit = true,
|
||||
autochdir = true,
|
||||
}
|
||||
|
||||
require('which-key').setup {
|
||||
|
|
@ -20,3 +21,8 @@ require('which-key').setup {
|
|||
}
|
||||
require('trouble').setup {}
|
||||
require('eyeliner').setup {}
|
||||
require('dressing').setup {}
|
||||
require('markview').setup()
|
||||
require('scope').setup({})
|
||||
require('neoclip').setup({default_register='+'})
|
||||
vim.keymap.set('n', '<leader>fp', '<cmd>Telescope neoclip<CR>', { noremap = true, silent = true, desc = 'Pick clipboard history' })
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ end
|
|||
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader><leader>',
|
||||
'<leader>fb',
|
||||
telescope.buffers,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find buffers' }
|
||||
)
|
||||
|
|
@ -35,12 +35,6 @@ vim.keymap.set(
|
|||
telescope.grep_string,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find grep current word' }
|
||||
)
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>fs',
|
||||
telescope.treesitter,
|
||||
{ noremap = true, silent = true, desc = 'Fuzzy find treesitter objects' }
|
||||
)
|
||||
vim.keymap.set('n', '<leader>fq', telescope.quickfix, { noremap = true, silent = true, desc = 'Fuzzy find quickfix' })
|
||||
vim.keymap.set('n', '<leader>f<BS>', telescope.resume, { noremap = true, silent = true, desc = 'Fuzzy find resume' })
|
||||
|
||||
|
|
|
|||
|
|
@ -33,11 +33,9 @@ require('nvim-treesitter.configs').setup {
|
|||
enable = true,
|
||||
set_jumps = true, -- whether to set jumps in the jumplist
|
||||
goto_next_start = {
|
||||
[']]'] = '@function.outer',
|
||||
[']a'] = '@parameter.inner',
|
||||
},
|
||||
goto_previous_start = {
|
||||
['[['] = '@function.outer',
|
||||
['[a'] = '@parameter.inner',
|
||||
},
|
||||
},
|
||||
|
|
@ -62,6 +60,6 @@ require('nvim-treesitter.configs').setup {
|
|||
}
|
||||
|
||||
require('treesitter-context').setup {
|
||||
max_lines = 3,
|
||||
max_lines = 2,
|
||||
min_window_height = 50
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue