diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 44f5b59..ab0d2fe 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -75,7 +75,6 @@ Plug 'vim-erlang/vim-erlang-omnicomplete', { 'for': 'erlang' } Plug 'vim-erlang/vim-erlang-compiler', { 'for': 'erlang' } " Purescript Plug 'purescript-contrib/purescript-vim', { 'for': 'purescript' } -Plug 'frigoeu/psc-ide-vim', { 'for': 'purescript' } " Neo/Async stuff Plug 'sbdchd/neoformat' Plug 'neomake/neomake' @@ -409,24 +408,6 @@ augroup haskell_maps au FileType haskell inoremap ;: :call MakeArrow(0) augroup END -augroup purescript_maps - au! - au FileType purescript nmap L :Plist - au FileType purescript nmap l :Pload - au FileType purescript nmap r :Prebuild - au FileType purescript nmap f :PaddClause - au FileType purescript nmap T :PaddType - au FileType purescript nmap a :Papply - au FileType purescript nmap c :Pcase - au FileType purescript nmap i :Pimport - au FileType purescript nmap q :PaddImportQualifications - au FileType purescript nmap g :Pgoto - au FileType purescript nmap p :Pursuit - au FileType purescript nmap t :Ptype - au FileType purescript au BufWritePost Prebuild - au FileType purescript setlocal keywordprg=:Pursuit -augroup END - augroup c_maps au! au FileType c nmap ct :NeomakeSh ctags -R . @@ -564,14 +545,8 @@ call deoplete#custom#option('sources', { \ 'haskell': ['LanguageClient', 'buffer', 'tag'], \ 'rust': ['LanguageClient', 'buffer'], \ 'python': ['LanguageClient', 'buffer'], - \ 'purescript': ['buffer', 'omni'], + \ 'purescript': ['LanguageClient', 'buffer'], \}) -call deoplete#custom#source('omni', 'functions', { - \ 'purescript': 'PSCIDEComplete', - \}) -call deoplete#custom#var('omni', 'input_patterns', { - \ 'purescript': '\w*', - \}) call deoplete#custom#option({ \ 'auto_complete_delay': 200, \ 'auto_complete': v:true, @@ -660,8 +635,6 @@ let g:cpp_concepts_highlight = 1 " For SLIMV let g:lisp_rainbow=1 -" For Purescript -let g:psc_ide_auto_imports = 1 " FZF let g:fzf_mru_no_sort = 1 @@ -679,7 +652,8 @@ let g:LanguageClient_serverCommands = { \ 'haskell': ['ghcide', '--lsp'], \ 'rust': ['ra_lsp_server'], \ 'python': ['pyls'], - \ } + \ 'purescript': ['purescript-language-server', '--stdio', '--config', '{}'], + \ } " Vista let g:vista_executive_for = {