mirror of
https://github.com/iofq/nvim.nix.git
synced 2026-01-23 08:55:16 -06:00
remove unused nix code
This commit is contained in:
parent
8922491578
commit
9a955d86a0
7 changed files with 196 additions and 387 deletions
|
|
@ -1,3 +1,8 @@
|
|||
local map = vim.keymap.set
|
||||
|
||||
require('mini.basics').setup { mappings = { windows = true } }
|
||||
require('mini.icons').setup()
|
||||
|
||||
require('dart').setup {
|
||||
tabline = {
|
||||
label_marked_fg = 'cyan',
|
||||
|
|
@ -30,6 +35,7 @@ require('snacks').setup {
|
|||
},
|
||||
smart = {
|
||||
multi = {
|
||||
'buffers',
|
||||
{ source = 'files', hidden = true },
|
||||
{ source = 'git_files', untracked = true },
|
||||
},
|
||||
|
|
@ -38,73 +44,39 @@ require('snacks').setup {
|
|||
},
|
||||
}
|
||||
|
||||
vim.keymap.set({ 'n', 't' }, '<C-\\>', function()
|
||||
Snacks.terminal.toggle()
|
||||
end, { desc = 'terminal open' })
|
||||
map({ 'n', 't' }, '<C-\\>', Snacks.terminal.toggle)
|
||||
map('n', '<leader>ff', Snacks.picker.smart)
|
||||
map('n', '<leader><leader>', Snacks.picker.smart)
|
||||
map('n', '<leader>fa', Snacks.picker.grep)
|
||||
map('n', '<leader>f8', Snacks.picker.grep_word)
|
||||
map('n', '<leader>f?', Snacks.picker.pickers)
|
||||
map('n', '<leader>fu', Snacks.picker.undo)
|
||||
map('n', '<leader>fj', Snacks.picker.jumps)
|
||||
map('n', '<leader>f.', Snacks.picker.resume)
|
||||
map('n', '<leader>fb', Snacks.picker.buffers)
|
||||
map('n', '<leader>fq', Snacks.picker.qflist)
|
||||
map('n', '<leader>jf', require('lib.snacks_jj').status)
|
||||
|
||||
vim.keymap.set('n', '<leader>ff', function()
|
||||
Snacks.picker.smart()
|
||||
end, { desc = 'Fuzzy find smart' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fa', function()
|
||||
Snacks.picker.grep()
|
||||
end, { desc = 'Fuzzy find grep' })
|
||||
|
||||
vim.keymap.set('n', '<leader>f8', function()
|
||||
Snacks.picker.grep_word()
|
||||
end, { desc = 'Fuzzy find grep word' })
|
||||
|
||||
vim.keymap.set('n', '<leader>f?', function()
|
||||
Snacks.picker.pickers()
|
||||
end, { desc = 'See all pickers' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fu', function()
|
||||
Snacks.picker.undo()
|
||||
end, { desc = 'Pick undotree' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fj', function()
|
||||
Snacks.picker.jumps()
|
||||
end, { desc = 'Pick jumps' })
|
||||
|
||||
vim.keymap.set('n', '<leader>f.', function()
|
||||
Snacks.picker.resume()
|
||||
end, { desc = 'Fuzzy find resume' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fb', function()
|
||||
Snacks.picker.buffers()
|
||||
end, { desc = 'Fuzzy find buffers' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fq', function()
|
||||
Snacks.picker.qflist()
|
||||
end, { desc = 'pick quickfix list' })
|
||||
|
||||
vim.keymap.set('n', '<leader>jf', function()
|
||||
require('lib.snacks_jj').status()
|
||||
end, { desc = 'pick notifications' })
|
||||
vim.schedule(function()
|
||||
require('nvim-treesitter').setup()
|
||||
require('nvim-treesitter-textobjects').setup()
|
||||
require('render-markdown').setup()
|
||||
|
||||
require('refactoring').setup()
|
||||
vim.keymap.set('n', '<leader>rr', function()
|
||||
require('refactoring').select_refactor()
|
||||
end, { desc = 'Refactor' })
|
||||
vim.keymap.set('n', '<leader>rv', function()
|
||||
map('n', '<leader>rr', require('refactoring').select_refactor)
|
||||
map('n', '<leader>rv', function()
|
||||
require('refactoring').refactor('Inline Variable')
|
||||
end, { desc = 'Inline Variable' })
|
||||
end)
|
||||
|
||||
require('quicker').setup()
|
||||
vim.keymap.set('n', '<leader>qf', function()
|
||||
map('n', '<leader>qf', function()
|
||||
require('quicker').toggle { max_height = 20 }
|
||||
end, { desc = 'Toggle qflist' })
|
||||
end)
|
||||
|
||||
local close = { { { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } } }
|
||||
require('diffview').setup {
|
||||
use_icons = false,
|
||||
enhanced_diff_hl = true,
|
||||
default_args = {
|
||||
DiffviewOpen = { '--imply-local' },
|
||||
},
|
||||
default_args = { DiffviewOpen = { '--imply-local' } },
|
||||
view = {
|
||||
merge_tool = {
|
||||
layout = 'diff4_mixed',
|
||||
|
|
@ -112,21 +84,19 @@ vim.schedule(function()
|
|||
},
|
||||
},
|
||||
keymaps = {
|
||||
view = {
|
||||
{ { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } },
|
||||
},
|
||||
file_panel = {
|
||||
{ { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } },
|
||||
},
|
||||
file_history_panel = {
|
||||
{ { 'n' }, 'q', vim.cmd.DiffviewClose, { desc = 'Close Diffview' } },
|
||||
},
|
||||
view = close,
|
||||
file_panel = close,
|
||||
file_history_panel = close,
|
||||
},
|
||||
}
|
||||
|
||||
vim.keymap.set('n', '<leader>nb', vim.cmd.DiffviewOpen, { desc = 'diffview open' })
|
||||
vim.keymap.set('n', '<leader>nH', vim.cmd.DiffviewFileHistory, { desc = 'diffview history' })
|
||||
vim.keymap.set('n', '<leader>nh', '<cmd>DiffviewFileHistory %<cr>', { desc = 'diffview history' })
|
||||
map('n', '<leader>nb', vim.cmd.DiffviewOpen)
|
||||
map('n', '<leader>nH', vim.cmd.DiffviewFileHistory)
|
||||
map('n', '<leader>nh', '<cmd>DiffviewFileHistory %<cr>')
|
||||
map('n', '<leader>go', function()
|
||||
local id = vim.fn.expand('<cword>')
|
||||
vim.cmd('DiffviewOpen ' .. id .. '~1' .. '..' .. id)
|
||||
end)
|
||||
|
||||
require('conform').setup {
|
||||
notify_no_formatters = false,
|
||||
|
|
@ -146,14 +116,14 @@ vim.schedule(function()
|
|||
return { timeout_ms = 1500, lsp_format = 'fallback' }
|
||||
end,
|
||||
}
|
||||
vim.keymap.set('n', '\\f', function()
|
||||
map('n', '\\f', function()
|
||||
vim.b.disable_autoformat = not vim.b.disable_autoformat
|
||||
vim.notify(string.format('Buffer formatting disabled: %s', vim.b.disable_autoformat))
|
||||
end, { desc = 'toggle buffer formatting' })
|
||||
vim.keymap.set('n', '\\F', function()
|
||||
end)
|
||||
map('n', '\\F', function()
|
||||
vim.g.disable_autoformat = not vim.g.disable_autoformat
|
||||
vim.notify(string.format('Global formatting disabled: %s', vim.g.disable_autoformat))
|
||||
end, { desc = 'toggle global formatting' })
|
||||
end)
|
||||
|
||||
require('lint').linters_by_ft = {
|
||||
docker = { 'hadolint' },
|
||||
|
|
@ -180,36 +150,10 @@ vim.schedule(function()
|
|||
enabled = function()
|
||||
return not vim.tbl_contains({ 'snacks_picker_input' }, vim.bo.filetype)
|
||||
end,
|
||||
fuzzy = {
|
||||
sorts = {
|
||||
'exact',
|
||||
'score',
|
||||
'sort_text',
|
||||
},
|
||||
},
|
||||
sources = {
|
||||
default = {
|
||||
'lsp',
|
||||
'path',
|
||||
'snippets',
|
||||
'ripgrep',
|
||||
'buffer',
|
||||
},
|
||||
default = { 'lsp', 'snippets', 'ripgrep', 'buffer' },
|
||||
providers = {
|
||||
lsp = {
|
||||
fallbacks = {}, -- include buffer even when LSP is active
|
||||
score_offset = 10,
|
||||
},
|
||||
snippets = {
|
||||
score_offset = -10,
|
||||
},
|
||||
path = {
|
||||
opts = {
|
||||
get_cwd = function(_)
|
||||
return vim.fn.getcwd() -- use nvim pwd instead of current file pwd
|
||||
end,
|
||||
},
|
||||
},
|
||||
lsp = { fallbacks = {} }, -- include buffer even when LSP is active
|
||||
ripgrep = {
|
||||
module = 'blink-ripgrep',
|
||||
name = 'rg',
|
||||
|
|
@ -219,35 +163,94 @@ vim.schedule(function()
|
|||
},
|
||||
},
|
||||
cmdline = {
|
||||
completion = {
|
||||
menu = {
|
||||
auto_show = true,
|
||||
},
|
||||
},
|
||||
completion = { menu = { auto_show = true } },
|
||||
},
|
||||
completion = {
|
||||
documentation = {
|
||||
auto_show = true,
|
||||
auto_show_delay_ms = 500,
|
||||
},
|
||||
documentation = { auto_show = true },
|
||||
menu = {
|
||||
draw = {
|
||||
treesitter = { 'lsp' },
|
||||
columns = {
|
||||
{ 'label', 'label_description', gap = 1 },
|
||||
{ 'source_name', 'kind', gap = 1 },
|
||||
},
|
||||
},
|
||||
},
|
||||
trigger = {
|
||||
show_on_keyword = true,
|
||||
},
|
||||
},
|
||||
signature = {
|
||||
enabled = true,
|
||||
trigger = {
|
||||
show_on_insert = true,
|
||||
},
|
||||
trigger = { show_on_insert = true },
|
||||
},
|
||||
}
|
||||
end)
|
||||
|
||||
vim.schedule(function()
|
||||
require('mini.align').setup()
|
||||
require('mini.pairs').setup()
|
||||
require('mini.surround').setup()
|
||||
require('mini.splitjoin').setup { detect = { separator = '[,;\n]' } }
|
||||
|
||||
local ai = require('mini.ai')
|
||||
ai.setup {
|
||||
n_lines = 300,
|
||||
custom_textobjects = {
|
||||
i = require('mini.extra').gen_ai_spec.indent(),
|
||||
a = ai.gen_spec.treesitter { a = '@parameter.outer', i = '@parameter.inner' },
|
||||
f = ai.gen_spec.treesitter { a = '@function.outer', i = '@function.inner' },
|
||||
},
|
||||
}
|
||||
|
||||
require('mini.git').setup()
|
||||
map('n', '<leader>gb', '<Cmd>Git blame -- %<CR>')
|
||||
|
||||
local jump = require('mini.jump2d')
|
||||
jump.setup {
|
||||
view = { n_steps_ahead = 1, dim = true },
|
||||
spotter = jump.gen_spotter.vimpattern(),
|
||||
}
|
||||
|
||||
local diff = require('mini.diff')
|
||||
diff.setup {
|
||||
source = {
|
||||
require('lib.minidiff_jj').gen_source(),
|
||||
diff.gen_source.git(),
|
||||
},
|
||||
}
|
||||
map('n', '<leader>gp', MiniDiff.toggle_overlay)
|
||||
|
||||
require('mini.files').setup {
|
||||
mappings = { go_in_plus = '<CR>' },
|
||||
windows = {
|
||||
preview = true,
|
||||
width_preview = 50,
|
||||
},
|
||||
}
|
||||
map('n', '<leader>nc', function()
|
||||
MiniFiles.open(vim.api.nvim_buf_get_name(0), false) -- open current buffer's dir
|
||||
MiniFiles.reveal_cwd()
|
||||
end)
|
||||
vim.api.nvim_create_autocmd('User', {
|
||||
pattern = 'MiniFilesBufferCreate',
|
||||
callback = function(args)
|
||||
map('n', '<leader>nc', function()
|
||||
MiniFiles.synchronize()
|
||||
MiniFiles.close()
|
||||
end, { buffer = args.data.buf_id })
|
||||
map('n', '`', function()
|
||||
local _, cur_entry_path = pcall(MiniFiles.get_fs_entry().path)
|
||||
local cur_directory = vim.fs.dirname(cur_entry_path)
|
||||
if cur_directory ~= '' then
|
||||
vim.fn.chdir(cur_directory)
|
||||
end
|
||||
end, { buffer = args.data.buf_id })
|
||||
end,
|
||||
})
|
||||
|
||||
-- pass file rename events to LSP
|
||||
vim.api.nvim_create_autocmd('User', {
|
||||
group = vim.api.nvim_create_augroup('snacks_rename', { clear = true }),
|
||||
pattern = 'MiniFilesActionRename',
|
||||
callback = function(event)
|
||||
Snacks.rename.on_rename_file(event.data.from, event.data.to)
|
||||
end,
|
||||
})
|
||||
end)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue