vim: Replace nvim-compe with nvim-cmp

This commit is contained in:
Geoffrey Frogeye 2024-01-09 20:00:12 +01:00
parent aeccc22857
commit d325eb2d27
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
5 changed files with 33 additions and 93 deletions

View file

@ -43,7 +43,6 @@
ffplay = "ffplay -hide_banner"; ffplay = "ffplay -hide_banner";
numbat = "numbat --intro-banner off"; numbat = "numbat --intro-banner off";
insect = "numbat"; insect = "numbat";
bat = "bat -A";
# Frequent mistakes # Frequent mistakes
sl = "ls"; sl = "ls";

View file

@ -1,6 +1,7 @@
{ pkgs, config, ... }: { { pkgs, config, ... }: {
imports = [ imports = [
./c.nix ./c.nix
./python.nix
./common.nix ./common.nix
]; ];
} }

View file

@ -38,6 +38,8 @@
syntax-theme = "base16"; syntax-theme = "base16";
}; };
}; };
# Also tried difftastic, and while I like the default theme it's a bit
# less configurable
lfs.enable = true; lfs.enable = true;
userEmail = lib.mkDefault "geoffrey@frogeye.fr"; userEmail = lib.mkDefault "geoffrey@frogeye.fr";
userName = lib.mkDefault "Geoffrey Frogeye"; userName = lib.mkDefault "Geoffrey Frogeye";

View file

@ -78,6 +78,34 @@ in
# Tabline # Tabline
barbar.enable = true; barbar.enable = true;
# Completion
nvim-cmp = {
enable = true;
mapping = { # Proposed example, since there's no default
"<C-Space>" = "cmp.mapping.complete()";
"<C-d>" = "cmp.mapping.scroll_docs(-4)";
"<C-e>" = "cmp.mapping.close()";
"<C-f>" = "cmp.mapping.scroll_docs(4)";
"<CR>" = "cmp.mapping.confirm({ select = true })";
"<S-Tab>" = {
action = "cmp.mapping.select_prev_item()";
modes = [ "i" "s" ];
};
"<Tab>" = {
action = "cmp.mapping.select_next_item()";
modes = [ "i" "s" ];
};
};
sources = [ # Respective plugins will get installed automatically
{ name = "buffer"; }
{ name = "calc"; }
{ name = "nvim_lsp"; }
{ name = "path"; }
{ name = "vsnip"; }
];
};
lspkind.enable = true; # Add icons to LSP completions
# Go to whatever # Go to whatever
telescope = { telescope = {
enable = true; enable = true;
@ -164,16 +192,12 @@ in
yamlls.enable = true; # YAML yamlls.enable = true; # YAML
# TODO Check out none-ls # TODO Check out none-ls
}; };
onAttach = ''
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
''; # Seems needed for auto-completion with nvim-compe
}; };
nvim-lightbulb = { nvim-lightbulb = {
# Shows a lightbulb whenever a codeAction is available under the cursor # Shows a lightbulb whenever a codeAction is available under the cursor
enable = true; enable = true;
autocmd.enabled = true; autocmd.enabled = true;
}; };
lspkind.enable = true; # Add icons to LSP completions
# Treesitter # Treesitter
treesitter = { treesitter = {
@ -231,13 +255,10 @@ in
lsp_signature-nvim # Show argument definition when typing a function lsp_signature-nvim # Show argument definition when typing a function
# Snippets # Snippets
vim-vsnip vim-vsnip
vim-vsnip-integ vim-vsnip-integ
friendly-snippets friendly-snippets
# TODO luasnip seems to be in Lua and more integrated with Nix.
# Auto-completion
nvim-compe
# TODO Archived. Maybe use nvim-cmp and plugins instead?
# Git # Git
fugitive-gitlab-vim # Open files in GitLab fugitive-gitlab-vim # Open files in GitLab
@ -257,7 +278,6 @@ in
./feline.lua ./feline.lua
./symbols-outline-nvim.lua ./symbols-outline-nvim.lua
./lsp_signature-nvim.lua ./lsp_signature-nvim.lua
./nvim-compe.lua
]; ];
extraConfigVim = '' extraConfigVim = ''
" GENERAL " GENERAL
@ -272,16 +292,6 @@ in
" vim-gutentags " vim-gutentags
let g:gutentags_cache_dir = expand('~/.cache/nvim/tags') let g:gutentags_cache_dir = expand('~/.cache/nvim/tags')
" nvim-compe
" Copy-pasted because I couldn't be bothered
set completeopt=menuone,noselect
inoremap <silent><expr> <C-Space> compe#complete()
inoremap <silent><expr> <CR> compe#confirm('<CR>')
inoremap <silent><expr> <C-e> compe#close('<C-e>')
inoremap <silent><expr> <C-f> compe#scroll({ 'delta': +4 })
inoremap <silent><expr> <C-d> compe#scroll({ 'delta': -4 })
'' + lib.optionalString config.frogeye.extra '' '' + lib.optionalString config.frogeye.extra ''
" languagetool " languagetool
let g:languagetool_cmd = "${pkgs.languagetool}/bin/languagetool-commandline" let g:languagetool_cmd = "${pkgs.languagetool}/bin/languagetool-commandline"

View file

@ -1,72 +0,0 @@
-- Default recommended config
require'compe'.setup {
enabled = true;
autocomplete = true;
debug = false;
min_length = 1;
preselect = 'enable';
throttle_time = 80;
source_timeout = 200;
resolve_timeout = 800;
incomplete_delay = 400;
max_abbr_width = 100;
max_kind_width = 100;
max_menu_width = 100;
documentation = {
border = { '', '' ,'', ' ', '', '', '', ' ' }, -- the border option is the same as `|help nvim_open_win|`
winhighlight = "NormalFloat:CompeDocumentation,FloatBorder:CompeDocumentationBorder",
max_width = 120,
min_width = 60,
max_height = math.floor(vim.o.lines * 0.3),
min_height = 1,
};
source = {
path = true;
buffer = true;
calc = true;
nvim_lsp = true;
vsnip = true;
};
}
-- Vim instructions were here
local t = function(str)
return vim.api.nvim_replace_termcodes(str, true, true, true)
end
local check_back_space = function()
local col = vim.fn.col('.') - 1
return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil
end
-- Use (s-)tab to:
--- move to prev/next item in completion menuone
--- jump to prev/next snippet's placeholder
_G.tab_complete = function()
if vim.fn.pumvisible() == 1 then
return t "<C-n>"
elseif vim.fn['vsnip#available'](1) == 1 then
return t "<Plug>(vsnip-expand-or-jump)"
elseif check_back_space() then
return t "<Tab>"
else
return vim.fn['compe#complete']()
end
end
_G.s_tab_complete = function()
if vim.fn.pumvisible() == 1 then
return t "<C-p>"
elseif vim.fn['vsnip#jumpable'](-1) == 1 then
return t "<Plug>(vsnip-jump-prev)"
else
-- If <S-Tab> is not working in your terminal, change it to <C-h>
return t "<S-Tab>"
end
end
vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})