refactor: lets try without mini.completion
This commit is contained in:
@@ -13,9 +13,9 @@ local gr = vim.api.nvim_create_augroup('custom-config', {})
|
|||||||
_G.Config = {
|
_G.Config = {
|
||||||
now = function(f) misc.safely('now', f) end,
|
now = function(f) misc.safely('now', f) end,
|
||||||
later = function(f) misc.safely('later', f) end,
|
later = function(f) misc.safely('later', f) end,
|
||||||
on_event = function(ev, f) misc.safely('event:' .. ev, f) end,
|
autocmd = function(event, pattern, callback, desc, once)
|
||||||
on_filetype = function(ft, f) misc.safely('filetype:' .. ft, f) end,
|
vim.api.nvim_create_autocmd(event, { group = gr, pattern = pattern, callback = callback, desc = desc, once = once })
|
||||||
autocmd = function(event, pattern, callback, desc) vim.api.nvim_create_autocmd(event, { group = gr, pattern = pattern, callback = callback, desc = desc }) end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
Config.now_if_args = vim.fn.argc(-1) > 0 and Config.now or Config.later
|
Config.now_if_args = vim.fn.argc(-1) > 0 and Config.now or Config.later
|
||||||
|
|||||||
@@ -39,11 +39,11 @@ vim.o.virtualedit = 'block' -- Allow going past end of line in blockwise mode
|
|||||||
|
|
||||||
vim.o.complete = '.,w,b,kspell' -- Use less sources
|
vim.o.complete = '.,w,b,kspell' -- Use less sources
|
||||||
vim.o.completeopt = 'menuone,noselect,fuzzy' -- Use custom behavior
|
vim.o.completeopt = 'menuone,noselect,fuzzy' -- Use custom behavior
|
||||||
vim.o.completetimeout = 100 -- Limit sources delay
|
|
||||||
|
|
||||||
-- Autocommands
|
-- Autocommands
|
||||||
Config.autocmd('TextYankPost', '*', function() vim.hl.hl_op() end, 'Highlight yanked text')
|
Config.autocmd('TextYankPost', '*', function() vim.hl.hl_op() end, 'Highlight yanked text')
|
||||||
Config.autocmd('TermOpen', '*', function() vim.cmd('startinsert') end, 'Start insert mode when terminal opens')
|
Config.autocmd('TermOpen', '*', function() vim.cmd('startinsert') end, 'Start insert mode when terminal opens')
|
||||||
|
Config.autocmd('LspAttach', '*', function(ev) vim.bo[ev.buf].complete = 'o' end, 'Use lsp completions')
|
||||||
|
|
||||||
-- Diagnostics
|
-- Diagnostics
|
||||||
Config.later(function()
|
Config.later(function()
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ nmap_leader('lr', '<Cmd>lua vim.lsp.buf.rename()<CR>', 'Rename')
|
|||||||
nmap_leader('lR', '<Cmd>lua vim.lsp.buf.references()<CR>', 'References')
|
nmap_leader('lR', '<Cmd>lua vim.lsp.buf.references()<CR>', 'References')
|
||||||
nmap_leader('ls', '<Cmd>lua vim.lsp.buf.definition()<CR>', 'Source definition')
|
nmap_leader('ls', '<Cmd>lua vim.lsp.buf.definition()<CR>', 'Source definition')
|
||||||
nmap_leader('lt', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', 'Type definition')
|
nmap_leader('lt', '<Cmd>lua vim.lsp.buf.type_definition()<CR>', 'Type definition')
|
||||||
|
vim.keymap.set('i', '<C-k>', vim.lsp.buf.signature_help, { desc = 'LSP Signature Help' })
|
||||||
|
|
||||||
-- Request
|
-- Request
|
||||||
nmap_leader('rs', '<Cmd>lua require("kulala").run()<CR>', 'Send HTTP request')
|
nmap_leader('rs', '<Cmd>lua require("kulala").run()<CR>', 'Send HTTP request')
|
||||||
@@ -125,6 +126,10 @@ nmap_leader('tf', '<Cmd>lua require("terminal").open_terminal_app("bash")<CR>',
|
|||||||
nmap_leader('tg', '<Cmd>lua require("terminal").open_terminal_app("lazygit")<CR>', 'LazyGit')
|
nmap_leader('tg', '<Cmd>lua require("terminal").open_terminal_app("lazygit")<CR>', 'LazyGit')
|
||||||
nmap_leader('ts', '<Cmd>lua require("terminal").open_terminal_app("lazysql")<CR>', 'LazySQL')
|
nmap_leader('ts', '<Cmd>lua require("terminal").open_terminal_app("lazysql")<CR>', 'LazySQL')
|
||||||
|
|
||||||
|
-- Brackets
|
||||||
|
vim.keymap.set('n', ']d', function() vim.diagnostic.goto_next({ float = true }) end, { desc = 'Next diagnostic' })
|
||||||
|
vim.keymap.set('n', '[d', function() vim.diagnostic.goto_prev({ float = true }) end, { desc = 'Previous diagnostic' })
|
||||||
|
|
||||||
-- Overwrites
|
-- Overwrites
|
||||||
vim.keymap.set('n', '<Esc>', '<Cmd>nohlsearch<CR>', { desc = 'Clear highlights', silent = true })
|
vim.keymap.set('n', '<Esc>', '<Cmd>nohlsearch<CR>', { desc = 'Clear highlights', silent = true })
|
||||||
vim.keymap.set('t', '<C-w>', '<C-\\><C-n><C-w>', { desc = 'Terminal window navigation', silent = true })
|
vim.keymap.set('t', '<C-w>', '<C-\\><C-n><C-w>', { desc = 'Terminal window navigation', silent = true })
|
||||||
|
|||||||
@@ -49,9 +49,7 @@ end)
|
|||||||
Config.later(function()
|
Config.later(function()
|
||||||
require('mini.ai').setup()
|
require('mini.ai').setup()
|
||||||
require('mini.pairs').setup()
|
require('mini.pairs').setup()
|
||||||
require('mini.surround').setup()
|
|
||||||
require('mini.pick').setup()
|
require('mini.pick').setup()
|
||||||
require('mini.bracketed').setup()
|
|
||||||
require('mini.extra').setup()
|
require('mini.extra').setup()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -65,25 +63,6 @@ Config.now_if_args(function()
|
|||||||
end, 'Add default marks')
|
end, 'Add default marks')
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- Completion
|
|
||||||
Config.now_if_args(function()
|
|
||||||
require('mini.completion').setup({
|
|
||||||
lsp_completion = {
|
|
||||||
source_func = 'omnifunc',
|
|
||||||
auto_setup = false,
|
|
||||||
process_items = function(items, base)
|
|
||||||
return MiniCompletion.default_process_items(items, base, { kind_priority = { Text = -1 } })
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
Config.on_event('LspAttach', function()
|
|
||||||
vim.bo.omnifunc = 'v:lua.MiniCompletion.completefunc_lsp'
|
|
||||||
end)
|
|
||||||
|
|
||||||
vim.lsp.config('*', { capabilities = MiniCompletion.get_lsp_capabilities() })
|
|
||||||
end)
|
|
||||||
|
|
||||||
-- Utilities
|
-- Utilities
|
||||||
Config.now_if_args(function()
|
Config.now_if_args(function()
|
||||||
require('mini.misc').setup()
|
require('mini.misc').setup()
|
||||||
|
|||||||
@@ -74,16 +74,16 @@ Config.later(function()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
-- Kulala
|
-- Kulala
|
||||||
Config.on_filetype('http', function()
|
Config.autocmd('FileType', 'http', function()
|
||||||
vim.pack.add({ 'https://github.com/mistweaverco/kulala.nvim' })
|
vim.pack.add({ 'https://github.com/mistweaverco/kulala.nvim' })
|
||||||
require('kulala').setup({ default_env = 'dev' })
|
require('kulala').setup({ default_env = 'dev' })
|
||||||
end)
|
end, 'Setup Kulala', true)
|
||||||
|
|
||||||
-- Flutter
|
-- Flutter
|
||||||
Config.on_filetype('dart', function()
|
Config.autocmd('FileType', 'dart', function()
|
||||||
vim.pack.add({
|
vim.pack.add({
|
||||||
'https://github.com/nvim-lua/plenary.nvim',
|
'https://github.com/nvim-lua/plenary.nvim',
|
||||||
'https://github.com/nvim-flutter/flutter-tools.nvim',
|
'https://github.com/nvim-flutter/flutter-tools.nvim',
|
||||||
})
|
})
|
||||||
require('flutter-tools').setup({ lsp = { color_capabilities = true } })
|
require('flutter-tools').setup({ lsp = { color_capabilities = true } })
|
||||||
end)
|
end, 'Setup flutter', true)
|
||||||
|
|||||||
Reference in New Issue
Block a user