nixpkgs/neovim: switch to mini.nvim for completion

.config/nixpkgs/neovim/flake.nix

@@ -57,11 +57,7 @@
               ]))
 
               nvim-lspconfig
-              cmp-nvim-lsp
-              cmp-buffer
-              nvim-cmp
-              cmp-vsnip
-              vim-vsnip
+              mini-nvim
               nvim-lsp-ts-utils
               null-ls-nvim
             ];

.config/nixpkgs/neovim/init.lua

@@ -21,9 +21,12 @@ vim.api.nvim_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', op
 vim.api.nvim_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
 vim.api.nvim_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setqflist({ severity = { min = vim.diagnostic.severity.WARN } })<CR>', opts)
 
+-- Allow pressing enter to autocomplete
+vim.api.nvim_set_keymap('i', '<CR>', 'pumvisible() ? "\\<C-y>" : "\\<CR>"', { noremap = true, expr = true })
+
 function on_attach(client, bufnr)
   -- Enable completion triggered by <c-x><c-o>
-  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.MiniCompletion.completefunc_lsp')
 
   -- Mappings.
   -- See `:help vim.lsp.*` for documentation on any of the below functions
@@ -48,12 +51,25 @@ require'nvim-treesitter.configs'.setup {
   },
 }
 
+require('mini.completion').setup({
+  delay = {
+    -- disable autocomplete
+    completion = 100000000,
+    info = 100,
+    signature = 50,
+  },
+  lsp_completion = {
+    source_func = 'omnifunc',
+    auto_setup = false,
+  },
+});
+
 local nvim_lsp = require('lspconfig')
 local null_ls = require('null-ls')
 
 local null_ls_sources = {}
 
-if vim.fn.executable("node_modules/.bin/eslint") then
+if vim.fn.executable("node_modules/.bin/eslint") == 1 then
   table.insert(null_ls_sources, null_ls.builtins.formatting.eslint_d)
   table.insert(null_ls_sources, null_ls.builtins.diagnostics.eslint_d)
   table.insert(null_ls_sources, null_ls.builtins.code_actions.eslint_d)
@@ -78,40 +94,9 @@ end
 
 if vim.fn.executable("node_modules/.bin/tsc") == 1 then
   local ts_utils = require("nvim-lsp-ts-utils")
-  ts_utils.setup({
-    debug = false,
-    disable_commands = false,
-    enable_import_on_completion = true,
-
-    -- import all
-    import_all_timeout = 5000, -- ms
-    -- lower numbers = higher priority
-    import_all_priorities = {
-        same_file = 1, -- add to existing import statement
-        local_files = 2, -- git files or files with relative path markers
-        buffer_content = 3, -- loaded buffer content
-        buffers = 4, -- loaded buffer names
-    },
-    import_all_scan_buffers = 100,
-    import_all_select_source = false,
-
-    -- filter diagnostics
-    filter_out_diagnostics_by_severity = {},
-    filter_out_diagnostics_by_code = {},
-
-    -- inlay hints
-    auto_inlay_hints = true,
-    inlay_hints_highlight = "Comment",
-
-    -- update imports on file move
-    update_imports_on_move = false,
-    require_confirmation_on_move = false,
-    watch_dir = nil,
-  })
 
   nvim_lsp.tsserver.setup({
     init_options = ts_utils.init_options,
-    capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()),
     flags = {
       debounce_text_changes = 150,
     },
@@ -121,6 +106,37 @@ if vim.fn.executable("node_modules/.bin/tsc") == 1 then
 
       on_attach(client, bufnr)
 
+      ts_utils.setup({
+        debug = false,
+        disable_commands = false,
+        enable_import_on_completion = true,
+
+        -- import all
+        import_all_timeout = 5000, -- ms
+        -- lower numbers = higher priority
+        import_all_priorities = {
+            same_file = 1, -- add to existing import statement
+            local_files = 2, -- git files or files with relative path markers
+            buffer_content = 3, -- loaded buffer content
+            buffers = 4, -- loaded buffer names
+        },
+        import_all_scan_buffers = 100,
+        import_all_select_source = false,
+
+        -- filter diagnostics
+        filter_out_diagnostics_by_severity = {},
+        filter_out_diagnostics_by_code = {},
+
+        -- inlay hints
+        auto_inlay_hints = true,
+        inlay_hints_highlight = "Comment",
+
+        -- update imports on file move
+        update_imports_on_move = false,
+        require_confirmation_on_move = false,
+        watch_dir = nil,
+      })
+
       -- required to fix code action ranges and filter diagnostics
       ts_utils.setup_client(client)
     end,
@@ -139,32 +155,5 @@ null_ls.setup({
       augroup END
       ]])
     end
-    on_attach(client, bufnr)
   end,
 });
-
--- Setup nvim-cmp.
-local cmp = require'cmp'
-
-cmp.setup({
-  completion = {
-    autocomplete = false,
-  },
-  snippet = {
-    expand = function(args)
-      vim.fn["vsnip#anonymous"](args.body)
-    end,
-  },
-  mapping = {
-    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.close(),
-    ['<CR>'] = cmp.mapping.confirm({ select = true }),
-  },
-  sources = {
-    { name = 'nvim_lsp' },
-    { name = 'vsnip' },
-    { name = 'buffer' },
-  }
-})

.config/nixpkgs/neovim/vimrc

@@ -129,4 +129,12 @@ augroup formatting
 augroup end
 
 colorscheme seti
-highlight link FloatBorder NonText
+
+" Use unset background so that syntax-highlighted text does not overwrite the
+" base color. This might cause problems on white backgrounded terminals but I
+" don't use those
+highlight Normal ctermbg=NONE
+
+" Add a background for popups and floats to distinguish from regular text
+highlight Pmenu ctermbg=235 guibg=#282a2b
+highlight link FloatBorder Pmenu