diff --git a/nvim/init.vim b/nvim/init.vim index 47986f7..5c7e27f 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -51,7 +51,6 @@ Plug 'junegunn/rainbow_parentheses.vim' Plug 'Olical/vim-scheme', { 'for': 'scheme', 'on': 'SchemeConnect' } " Haskell Plug 'neovimhaskell/haskell-vim', { 'for': [ 'haskell', 'cabal' ] } -Plug 'parsonsmatt/intero-neovim' Plug 'neomake/neomake' " For Nix Plug 'LnL7/vim-nix', { 'for': 'nix' } @@ -218,45 +217,6 @@ noremap noremap noremap -augroup interoMaps - au! - " Maps for intero. Restrict to Haskell buffers so the bindings don't collide. - - " Background process and window management - au FileType haskell nnoremap is :InteroStart - au FileType haskell nnoremap ir :InteroRestart - au FileType haskell nnoremap ik :InteroKill - - " Open intero/GHCi split horizontally - au FileType haskell nnoremap io :InteroOpen - " Open intero/GHCi split vertically - au FileType haskell nnoremap iov :InteroOpenH - au FileType haskell nnoremap ih :InteroHide - - " Reloading (pick one) - " Automatically reload on save - " au BufWritePost *.hs InteroReload - " Manually save and reload - au FileType haskell nnoremap wr :w \| :InteroReload - - " Load individual modules - au FileType haskell nnoremap il :InteroLoadCurrentModule - au FileType haskell nnoremap if :InteroLoadCurrentFile - - " Type-related information - " Heads up! These next two differ from the rest. - au FileType haskell map it InteroGenericType - au FileType haskell map T InteroType - au FileType haskell nnoremap iit :InteroTypeInsert - - " Navigation - au FileType haskell nnoremap id :InteroGoToDef - - " Managing targets - " Prompts you to enter targets (no silent): - au FileType haskell nnoremap ist :InteroSetTargets -augroup END - augroup deopleteMaps au! " For deoplete Rust @@ -300,19 +260,6 @@ let g:haskell_indent_guard = 2 let g:haskell_indent_case_alternative = 1 let g:cabal_indent_section = 2 -" Intero starts automatically. Set this if you'd like to prevent that. -let g:intero_start_immediately = 0 -" Enable type information on hover (when holding cursor at point for ~1 second). -let g:intero_type_on_hover = 1 -" Change the intero window size; default is 10. -let g:intero_window_size = 75 -" Sets the intero window to split vertically; default is horizontal -let g:intero_vertical_split = 1 -" Use GHCi backend -let g:intero_backend = { - \ 'command' : 'stack ghci', - \ } - " Use deoplete let g:deoplete#enable_at_startup = 1 " Disable autocomplete by default