From 866145c8ac356bf3be05cfd36fe84ee4ecb7eff4 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Fri, 4 Jun 2021 17:43:25 +0200 Subject: minor vimrc updates --- vim-new/vimrc | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/vim-new/vimrc b/vim-new/vimrc index 95a0c50..7ab0e1b 100644 --- a/vim-new/vimrc +++ b/vim-new/vimrc @@ -37,6 +37,7 @@ Plug 'ndmitchell/ghcid', { 'rtp': 'plugins/nvim' } call plug#end() " }}} +" 256 colorscheme colorscheme zenburn " {{{ misc @@ -52,6 +53,10 @@ set colorcolumn=73 set backspace=2 " }}} + +" disable preview window on autocompletion +set completeopt-=preview + set updatetime=300 set signcolumn=yes @@ -69,36 +74,6 @@ let g:airline_powerline_fonts = 1 nnoremap :call LanguageClient_contextMenu() let g:LanguageClient_serverCommands = { 'haskell': ['haskell-language-server-wrapper', '--lsp'] } -let g:LanguageClient_diagnosticsDisplay = { - \ 1: { - \ "name": "Error", - \ "texthl": "LanguageClientError", - \ "signText": "X", - \ "signTexthl": "LanguageClientErrorSign", - \ "virtualTexthl": "Error" - \ }, - \ 2: { - \ "name": "Warning", - \ "texthl": "LanguageClientWarning", - \ "signText": "W", - \ "signTexthl": "LanguageClientWarningSign", - \ "virtualTexthl": "Todo", - \ }, - \ 3: { - \ "name": "Information", - \ "texthl": "LanguageClientInfo", - \ "signText": "i", - \ "signTexthl": "LanguageClientInfoSign", - \ "virtualTexthl": "Todo", - \ }, - \ 4: { - \ "name": "Hint", - \ "texthl": "LanguageClientInfo", - \ "signText": "!", - \ "signTexthl": "LanguageClientInfoSign", - \ "virtualTexthl": "Todo", - \ }, - \ } let g:haskell_enable_quantification = 1 " to enable highlighting of `forall` let g:haskell_enable_recursivedo = 1 " to enable highlighting of `mdo` and `rec` @@ -126,6 +101,7 @@ set foldlevelstart=0 " {{{ search set hlsearch set incsearch +set ignorecase set smartcase " }}} @@ -171,6 +147,11 @@ nnoremap h :nohlsearch " show list if multiple ctrl-] matches nnoremap g +augroup filetype_haskell + autocmd! + autocmd Filetype haskell nnoremap :call LanguageClient#textDocument_definition() + autocmd Filetype haskell nnoremap i :call LanguageClient#textDocument_hover() +augroup END " ctrl-space auto complete in insert mode inoremap @@ -179,7 +160,7 @@ inoremap nmap f :Files| " fuzzy find files in the working directory (where you launched Vim from) nmap / :BLines| " fuzzy find lines in the current file nmap b :Buffers| " fuzzy find an open buffer -nmap r :Rg | " fuzzy find text in the working directory +nmap a :Rg | " fuzzy find text in the working directory nmap c :Commands| " fuzzy find Vim commands (like Ctrl-Shift-P in Sublime/Atom/VSC) nmap t :Tags| " fuzzy find tags " }}} -- cgit v1.2.3