From 5a86a25849e08dc5f0444ad62cd71b84699055fa Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Fri, 6 Jan 2023 10:18:13 +0100 Subject: [PATCH] Update neovim config --- home-manager-modules/neovim/default.nix | 17 +- home-manager-modules/neovim/settings.lua | 213 ++++++++++++++++++++--- 2 files changed, 191 insertions(+), 39 deletions(-) diff --git a/home-manager-modules/neovim/default.nix b/home-manager-modules/neovim/default.nix index 8c6d31a..e0e4c99 100644 --- a/home-manager-modules/neovim/default.nix +++ b/home-manager-modules/neovim/default.nix @@ -21,11 +21,11 @@ with lib; config = mkIf cfg.enable { - home.packages = with pkgs; [ nixfmt git nodejs ripgrep ]; + home.packages = with pkgs; [ nixfmt git nodejs ripgrep gcc ]; programs.neovim = { enable = true; - package = pkgs.unstable.neovim-unwrapped; + package = pkgs.neovim-unwrapped; viAlias = true; vimAlias = true; vimdiffAlias = true; @@ -46,10 +46,9 @@ with lib; }; withPython3 = true; - plugins = with pkgs.unstable.vimPlugins; [ + plugins = with pkgs.vimPlugins; [ #theme onedarker - # LSP nvim-lspconfig @@ -60,6 +59,10 @@ with lib; nvim-web-devicons + pkgs.unstable.vimPlugins.bufferline-nvim + nvim-colorizer-lua + pears-nvim + nvim-tree-lua (nvim-treesitter.withPlugins (ps: with ps; [ tree-sitter-nix @@ -67,11 +70,6 @@ with lib; ])) - bufferline-nvim - nvim-colorizer-lua - pears-nvim - nvim-tree-lua - vim-lastplace vim-nix vim-nixhash @@ -83,7 +81,6 @@ with lib; vim-scriptease semshi coc-prettier - coc-rust-analyzer rust-vim ]; diff --git a/home-manager-modules/neovim/settings.lua b/home-manager-modules/neovim/settings.lua index b55423c..c04ea5b 100644 --- a/home-manager-modules/neovim/settings.lua +++ b/home-manager-modules/neovim/settings.lua @@ -7,35 +7,6 @@ opt.writebackup = false opt.updatetime = 300 opt.signcolumn = "yes" -function _G.check_back_space() - local col = vim.fn.col('.') - 1 - return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') -end - -local opts = {silent = true, noremap = true, expr = true} -keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) -keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) -keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) - - -keyset("n", "gd", "(coc-definition)", {silent = true}) -keyset("n", "gy", "(coc-type-definition)", {silent = true}) -keyset("n", "gi", "(coc-implementation)", {silent = true}) -keyset("n", "gr", "(coc-references)", {silent = true}) - -function _G.show_docs() - local cw = vim.fn.expand('') - if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then - vim.api.nvim_command('h ' .. cw) - elseif vim.api.nvim_eval('coc#rpc#ready()') then - vim.fn.CocActionAsync('doHover') - else - vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) - end -end -keyset("n", "K", 'lua _G.show_docs()', {silent = true}) - - vim.cmd [[ syntax on @@ -74,3 +45,187 @@ require'nvim-treesitter.configs'.setup { enable = true }, } + + + +-- Some servers have issues with backup files, see #649. +vim.opt.backup = false +vim.opt.writebackup = false + +-- Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable +-- delays and poor user experience. +vim.opt.updatetime = 300 + +-- Always show the signcolumn, otherwise it would shift the text each time +-- diagnostics appear/become resolved. +vim.opt.signcolumn = "yes" + +local keyset = vim.keymap.set +-- Auto complete +function _G.check_back_space() + local col = vim.fn.col('.') - 1 + return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil +end + +-- Use tab for trigger completion with characters ahead and navigate. +-- NOTE: There's always complete item selected by default, you may want to enable +-- no select by `"suggest.noselect": true` in your configuration file. +-- NOTE: Use command ':verbose imap ' to make sure tab is not mapped by +-- other plugin before putting this into your config. +local opts = {silent = true, noremap = true, expr = true, replace_keycodes = false} +keyset("i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts) +keyset("i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts) + +-- Make to accept selected completion item or notify coc.nvim to format +-- u breaks current undo, please make your own choice. +keyset("i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts) + +-- Use to trigger snippets +keyset("i", "", "(coc-snippets-expand-jump)") +-- Use to trigger completion. +keyset("i", "", "coc#refresh()", {silent = true, expr = true}) + +-- Use `[g` and `]g` to navigate diagnostics +-- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. +keyset("n", "[g", "(coc-diagnostic-prev)", {silent = true}) +keyset("n", "]g", "(coc-diagnostic-next)", {silent = true}) + +-- GoTo code navigation. +keyset("n", "gd", "(coc-definition)", {silent = true}) +keyset("n", "gy", "(coc-type-definition)", {silent = true}) +keyset("n", "gi", "(coc-implementation)", {silent = true}) +keyset("n", "gr", "(coc-references)", {silent = true}) + + +-- Use K to show documentation in preview window. +function _G.show_docs() + local cw = vim.fn.expand('') + if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then + vim.api.nvim_command('h ' .. cw) + elseif vim.api.nvim_eval('coc#rpc#ready()') then + vim.fn.CocActionAsync('doHover') + else + vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw) + end +end +keyset("n", "K", 'lua _G.show_docs()', {silent = true}) + + +-- Highlight the symbol and its references when holding the cursor. +vim.api.nvim_create_augroup("CocGroup", {}) +vim.api.nvim_create_autocmd("CursorHold", { + group = "CocGroup", + command = "silent call CocActionAsync('highlight')", + desc = "Highlight symbol under cursor on CursorHold" +}) + + +-- Symbol renaming. +keyset("n", "rn", "(coc-rename)", {silent = true}) + + +-- Formatting selected code. +keyset("x", "f", "(coc-format-selected)", {silent = true}) +keyset("n", "f", "(coc-format-selected)", {silent = true}) + + +-- Setup formatexpr specified filetype(s). +vim.api.nvim_create_autocmd("FileType", { + group = "CocGroup", + pattern = "typescript,json", + command = "setl formatexpr=CocAction('formatSelected')", + desc = "Setup formatexpr specified filetype(s)." +}) + +-- Update signature help on jump placeholder. +vim.api.nvim_create_autocmd("User", { + group = "CocGroup", + pattern = "CocJumpPlaceholder", + command = "call CocActionAsync('showSignatureHelp')", + desc = "Update signature help on jump placeholder" +}) + + +-- Applying codeAction to the selected region. +-- Example: `aap` for current paragraph +local opts = {silent = true, nowait = true} +keyset("x", "a", "(coc-codeaction-selected)", opts) +keyset("n", "a", "(coc-codeaction-selected)", opts) + +-- Remap keys for applying codeAction to the current buffer. +keyset("n", "ac", "(coc-codeaction)", opts) + + +-- Apply AutoFix to problem on the current line. +keyset("n", "qf", "(coc-fix-current)", opts) + + +-- Run the Code Lens action on the current line. +keyset("n", "cl", "(coc-codelens-action)", opts) + + +-- Map function and class text objects +-- NOTE: Requires 'textDocument.documentSymbol' support from the language server. +keyset("x", "if", "(coc-funcobj-i)", opts) +keyset("o", "if", "(coc-funcobj-i)", opts) +keyset("x", "af", "(coc-funcobj-a)", opts) +keyset("o", "af", "(coc-funcobj-a)", opts) +keyset("x", "ic", "(coc-classobj-i)", opts) +keyset("o", "ic", "(coc-classobj-i)", opts) +keyset("x", "ac", "(coc-classobj-a)", opts) +keyset("o", "ac", "(coc-classobj-a)", opts) + + +-- Remap and for scroll float windows/popups. +---@diagnostic disable-next-line: redefined-local +local opts = {silent = true, nowait = true, expr = true} +keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) +keyset("n", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) +keyset("i", "", + 'coc#float#has_scroll() ? "=coc#float#scroll(1)" : ""', opts) +keyset("i", "", + 'coc#float#has_scroll() ? "=coc#float#scroll(0)" : ""', opts) +keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(1) : ""', opts) +keyset("v", "", 'coc#float#has_scroll() ? coc#float#scroll(0) : ""', opts) + + +-- Use CTRL-S for selections ranges. +-- Requires 'textDocument/selectionRange' support of language server. +keyset("n", "", "(coc-range-select)", {silent = true}) +keyset("x", "", "(coc-range-select)", {silent = true}) + + +-- Add `:Format` command to format current buffer. +vim.api.nvim_create_user_command("Format", "call CocAction('format')", {}) + +-- " Add `:Fold` command to fold current buffer. +vim.api.nvim_create_user_command("Fold", "call CocAction('fold', )", {nargs = '?'}) + +-- Add `:OR` command for organize imports of the current buffer. +vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {}) + +-- Add (Neo)Vim's native statusline support. +-- NOTE: Please see `:h coc-status` for integrations with external plugins that +-- provide custom statusline: lightline.vim, vim-airline. +vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") + +-- Mappings for CoCList +-- code actions and coc stuff +---@diagnostic disable-next-line: redefined-local +local opts = {silent = true, nowait = true} +-- Show all diagnostics. +keyset("n", "a", ":CocList diagnostics", opts) +-- Manage extensions. +keyset("n", "e", ":CocList extensions", opts) +-- Show commands. +keyset("n", "c", ":CocList commands", opts) +-- Find symbol of current document. +keyset("n", "o", ":CocList outline", opts) +-- Search workspace symbols. +keyset("n", "s", ":CocList -I symbols", opts) +-- Do default action for next item. +keyset("n", "j", ":CocNext", opts) +-- Do default action for previous item. +keyset("n", "k", ":CocPrev", opts) +-- Resume latest coc list. +keyset("n", "p", ":CocListResume", opts)