diff --git a/autoload/SpaceVim/layers/lang/typescript.vim b/autoload/SpaceVim/layers/lang/typescript.vim
index 543354b00..54b2acbfb 100644
--- a/autoload/SpaceVim/layers/lang/typescript.vim
+++ b/autoload/SpaceVim/layers/lang/typescript.vim
@@ -10,7 +10,11 @@
 function! SpaceVim#layers#lang#typescript#plugins() abort
     let plugins = []
     call add(plugins, ['leafgarland/typescript-vim'])
-    call add(plugins, ['Quramy/tsuquyomi'])
+    if has('nvim')
+        call add(plugins, ['mhartington/nvim-typescript'])
+    else
+        call add(plugins, ['Quramy/tsuquyomi'])
+    endif
     return plugins
 endfunction
 
diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim
index d214abc2b..45dc927cb 100644
--- a/config/plugins/deoplete.vim
+++ b/config/plugins/deoplete.vim
@@ -48,6 +48,11 @@ let g:deoplete#ignore_sources.javascript = get(g:deoplete#ignore_sources, 'javas
 call deoplete#custom#set('ternjs', 'mark', 'tern')
 call deoplete#custom#set('ternjs', 'rank', 9999)
 
+" typescript
+let g:deoplete#ignore_sources.typescript = get(g:deoplete#ignore_sources, 'typescript', ['tag','omni', 'syntax'])
+call deoplete#custom#set('typescript', 'rank', 9999)
+
+
 " php
 let g:deoplete#omni#input_patterns.php = get(g:deoplete#omni#input_patterns, 'php', [
       \'[^. \t0-9]\.\w*',