backlog

common/nvim/init.vim

@@ -15,6 +15,7 @@ Plug 'tpope/vim-sleuth'
 Plug 'm-demare/hlargs.nvim'
 Plug 'nvim-treesitter/nvim-treesitter'
 Plug 'windwp/nvim-ts-autotag'
+Plug 'mileszs/ack.vim'
 
 " interface
 Plug 'romgrk/barbar.nvim'
@@ -28,8 +29,8 @@ Plug 'kevinhwang91/nvim-hlslens'
 Plug 'sheerun/vim-polyglot'
 Plug 'dense-analysis/ale'
 Plug 'neovim/nvim-lspconfig'
-"Plug 'jose-elias-alvarez/null-ls.nvim'
 
+" autocomplete
 Plug 'hrsh7th/nvim-cmp'
 Plug 'hrsh7th/cmp-nvim-lsp'
 Plug 'hrsh7th/cmp-cmdline'
@@ -78,6 +79,7 @@ let g:presence_buttons = 0
 let g:ale_linters = {
 \  'javascript': ['eslint'],
 \  'typescript': ['eslint', 'tsserver'],
+\  'rust': ['rust-analyzer'],
 \}
 let g:ale_fixers = {
 \  '*': ['trim_whitespace'],
@@ -86,12 +88,15 @@ let g:ale_fixers = {
 \  'typescript': ['prettier', 'eslint'],
 \  'json': ['prettier'],
 \  'css': ['prettier'],
+\  'rust': ['rustfmt'],
 \}
 let g:ale_fix_on_save = 1
 
 set fillchars+=vert:▎
 
 set completeopt=menu,menuone,noselect
+
+let g:ackprg = 'ag --vimgrep'
 " }}}
 
 " {{{ scripts
@@ -135,32 +140,6 @@ require("hlslens").setup(
 )
 EOF
 
-lua << EOF
---[[local null_ls = require("null-ls")
-local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
-
-null_ls.setup({
-  sources = {
-    null_ls.builtins.diagnostics.eslint,
-    null_ls.builtins.diagnostics.zsh,
-    null_ls.builtins.formatting.eslint,
-    null_ls.builtins.formatting.prettier,
-  },
-  on_attach = function(client, buffer)
-    if client.supports_method("textDocument/formatting") then
-      vim.api.nvim_clear_autocmds({group = augroup, buffer = buffer})
-      vim.api.nvim_create_autocmd("BufWritePre", {
-        group = augroup,
-        buffer = buffer,
-        callback = function()
-          vim.lsp.buf.formatting_sync()
-        end,
-      })
-    end
-  end,
-})--]]
-EOF
-
 lua <<EOF
 local cmp = require("cmp")
 
@@ -230,34 +209,31 @@ cmp.setup.cmdline(
       {name = "cmdline", group_index = 1},
       {name = "cmdline_history", group_index = 2},
     },
-    mapping = cmp.mapping.preset.insert(mapping),
+    mapping = cmp.mapping.preset.cmdline(mapping),
   }
 )
 
 cmp.setup.cmdline(
-  "/",
+  {"/", "?"},
   {
     sources = {
-      {name = "cmdline_history"},
       {name = "buffer"}
     },
-    mapping = cmp.mapping.preset.insert(mapping),
+    mapping = cmp.mapping.preset.cmdline(mapping),
   }
 )
 
 local lspconfig = require("lspconfig")
 local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
-lspconfig.eslint.setup(
-  {
-    capabilities = capabilities,
-  }
-)
---[[lspconfig.tsserver.setup(
-  {
-    capabilities = capabilities,
-  }
-)--]]
+local servers = {"eslint", "tsserver", "rust_analyzer"}
+for _, lsp in ipairs(servers) do
+  lspconfig[lsp].setup(
+    {
+      capabilities = capabilities,
+    }
+  )
+end
 EOF
 " }}}
 
@@ -265,7 +241,7 @@ EOF
 tnoremap <Esc> <C-\><C-n>
 
 inoremap <silent> <C-f> <C-i>
-inoremap <silent> <C-S-f> <C-d>
+cnoremap <silent> <C-f> <C-i>
 map! <silent> <Tab> <Esc>
 cnoremap <silent> <Tab> <C-c>