diff --git a/autoload/SpaceVim/layers/lang.vim b/autoload/SpaceVim/layers/lang.vim
index 65eddd4dc..4b19d7c64 100644
--- a/autoload/SpaceVim/layers/lang.vim
+++ b/autoload/SpaceVim/layers/lang.vim
@@ -19,13 +19,11 @@ function! SpaceVim#layers#lang#plugins() abort
                 \ ['todesking/vint-syntastic',               { 'on_ft' : 'vim'}],
                 \ ['plasticboy/vim-markdown',                { 'on_ft' : 'markdown'}],
                 \ ['elixir-lang/vim-elixir',                 { 'on_ft' : 'elixir'}],
-                \ ['racer-rust/vim-racer',                   { 'on_ft' : 'rust'}],
                 \ ['PotatoesMaster/i3-vim-syntax',           { 'on_ft' : 'i3'}],
                 \ ['isundil/vim-irssi-syntax',               { 'on_ft' : 'irssi'}],
                 \ ['lervag/vimtex',                          { 'on_ft' : 'tex'}],
                 \ ['vimperator/vimperator.vim',              { 'on_ft' : 'vimperator'}],
                 \ ['voxpupuli/vim-puppet',                   {'on_ft' : 'puppet'}],
-                \ ['rust-lang/rust.vim',            {'merged' : 1}],
                 \ ] 
     " python
     if has('nvim')
diff --git a/autoload/SpaceVim/layers/lang/rust.vim b/autoload/SpaceVim/layers/lang/rust.vim
new file mode 100644
index 000000000..b524b9f3b
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/rust.vim
@@ -0,0 +1,10 @@
+function! SpaceVim#layers#lang#rust#plugins() abort
+    let plugins = []
+    call add(plugins, ['racer-rust/vim-racer',                   { 'on_ft' : 'rust'}])
+    call add(plugins, ['rust-lang/rust.vim',            {'merged' : 1}])
+    return plugins
+endfunction
+
+function! SpaceVim#layers#lang#rust#config() abort
+    
+endfunction
diff --git a/config/neovim.vim b/config/neovim.vim
index 6b3bab662..17b866647 100644
--- a/config/neovim.vim
+++ b/config/neovim.vim
@@ -17,7 +17,7 @@ command! -range=% REPLSendSelection call REPLSend(s:GetVisual())
 command! REPLSendLine call REPLSend([getline('.')])
 " }}}
 "let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-"let $NVIM_TUI_ENABLE_CURSOR_SHAPE=1
+let $NVIM_TUI_ENABLE_CURSOR_SHAPE=2
 "silent! let &t_SI = "\<Esc>]50;CursorShape=1\x7"
 "silent! let &t_SR = "\<Esc>]50;CursorShape=2\x7"
 "silent! let &t_EI = "\<Esc>]50;CursorShape=0\x7"