From af4450ae69b823a6b6b58bc79dd15f20674bf5b2 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Tue, 6 Apr 2021 23:06:59 -0700
Subject: [PATCH] Update Neovim dotfile.

---
 nvim/.config/nvim/init.vim | 59 ++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9753588..0133bcb 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -2,14 +2,15 @@ call plug#begin('~/.config/nvim/plugged')
 " Language Tools
 Plug 'roxma/nvim-yarp' " For language client
 Plug 'ncm2/ncm2' " For language client
-Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh' }
+Plug 'autozimu/LanguageClient-neovim', {'branch': '0.1.159', 'do': 'bash install.sh' }
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' }
 Plug 'junegunn/fzf.vim'
 Plug 'SirVer/ultisnips'
 Plug 'enomsg/vim-haskellConcealPlus'
 
 " Languages
-Plug 'https://framagit.org/tyreunom/coquille.git'
+Plug 'LnL7/vim-nix'
+Plug 'whonore/Coqtail'
 Plug 'lervag/vimtex'
 Plug 'idris-hackers/idris-vim'
 Plug 'rhysd/vim-crystal'
@@ -17,6 +18,11 @@ Plug 'elmcast/elm-vim'
 Plug 'ap/vim-css-color'
 Plug 'vim-scripts/avrasm.vim'
 Plug 'idris-hackers/idris-vim'
+Plug 'elixir-editors/vim-elixir'
+Plug 'guersam/vim-j'
+Plug 'wlangstroth/vim-racket'
+Plug 'derekelkins/agda-vim'
+Plug 'ftorres16/spice.vim'
 
 " Themes
 Plug 'arcticicestudio/nord-vim'
@@ -25,6 +31,7 @@ Plug 'arcticicestudio/nord-vim'
 Plug 'junegunn/goyo.vim'
 Plug 'iamcco/markdown-preview.vim'
 Plug 'junegunn/limelight.vim'
+Plug 'luochen1990/rainbow'
 call plug#end()
 
 set exrc " Execute local vimscripts
@@ -34,25 +41,29 @@ set number " Set line numbers
 set mouse=a " Allow mouse
 set signcolumn=yes " Always show extra column
 set guifont=Iosevka
+set hidden
 
 autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers
 autocmd BufRead,BufNewFile *.v set filetype=coq " Coq is not Verilog
+autocmd BufNewFile,BufRead *.cir set filetype=spice " LTSpice is Spice
 autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
 
 set completeopt=noinsert,menuone
 
+let g:rainbow_active = 1
+let g:LanguageClient_selectionUI = "fzf"
 let g:LanguageClient_hasSnippetSupport = 0
 let g:LanguageClient_serverCommands = {
-            \ 'haskell': ['ghcide', '--lsp'],
-            \ 'rust': ['rustup', 'run', 'stable', 'rls'],
-            \ 'c': ['clangd'],
-            \ 'crystal': ['scry'],
-            \ 'cpp': ['clangd'],
-            \ 'javascript': ['javascript-typescript-stdio'],
-            \ 'elm': ['elm-language-server', '--stdio'],
-            \ 'python': ['python', '-m', 'pyls']
-            \ }
-let g:deoplete#enable_at_startup = 1
+              \ 'haskell': ['haskell-language-server-wrapper', '--lsp'],
+              \ 'rust': ['rls'],
+              \ 'c': ['clangd'],
+              \ 'crystal': ['/home/vanilla/software/crystalline/crystalline'],
+              \ 'cpp': ['clangd'],
+              \ 'javascript': ['javascript-typescript-stdio'],
+              \ 'elm': ['elm-language-server', '--stdio'],
+              \ 'python': ['python', '-m', 'pyls'],
+              \ 'elixir': ['/home/vanilla/software/elixir-ls/language_server.sh']
+              \ }
 let g:LanguageClient_diagnosticsDisplay = {
             \ 1: {"name": "Error","texthl": "ALEError","signText": ">>","signTexthl": "ALEErrorSign",},
             \ 2: {"name": "Warning","texthl": "ALEWarning","signText": ">>","signTexthl": "ALEWarningSign",},
@@ -60,19 +71,31 @@ let g:LanguageClient_diagnosticsDisplay = {
             \ 4: {"name": "Hint","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},}
 let g:LanguageClient_rootMarkers = {
             \ 'haskell': ['.git'],
+            \ 'crystal': ['.git'],
             \ 'elm': ['elm.json'],
             \ }
 
+let g:deoplete#enable_at_startup = 1
+
 let g:limelight_conceal_ctermfg = 8
 
 let g:UltiSnipsExpandTrigger="<tab>"
 let g:UltiSnipsJumpForwardTrigger="<c-k>"
 let g:UltiSnipsJumpBackwardTrigger="<c-j>"
 
-colorscheme nord
-nmap M :call LanguageClient#explainErrorAtPoint()<CR>
-nmap K :call LanguageClient_contextMenu()<CR>
-nmap ? :call LanguageClient#textDocument_hover()<CR>
+let g:fzf_action = { 'enter': 'tab drop' }
 
-hi default link CheckedByCoq Visual
-hi default link SentToCoq PmenuSel
+let g:neovide_cursor_vfx_mode="ripple"
+
+let g:tex_flavor = 'latex'
+
+colorscheme nord
+nmap <c-e> :Files<CR>
+nmap <silent>K <Plug>(lcn-menu)
+nmap <silent>M <Plug>(lcn-explain-error)
+nmap <silent>? <Plug>(lcn-hover)
+
+function! g:CoqtailHighlight()
+    hi default link CoqtailChecked Visual
+    hi default link CoqtailSent PmenuSel
+endfunction