diff --git a/.gitmodules b/.gitmodules
index 143fd2ac..f2030cc8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,3 +73,6 @@
 [submodule "nvim/.config/nvim/pack/bundle/opt/vim-snippets"]
 	path = nvim/.config/nvim/pack/bundle/opt/vim-snippets
 	url = https://github.com/honza/vim-snippets
+[submodule "nvim/.config/nvim/pack/bundle/opt/lexima.vim"]
+	path = nvim/.config/nvim/pack/bundle/opt/lexima.vim
+	url = https://github.com/cohama/lexima.vim
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 4df98874..5bd66e9a 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -6,20 +6,27 @@ if has('packages')
 	packadd! AnsiEsc.vim
 	packadd! fzf.vim
 	packadd! gruvbox
+	packadd! lexima.vim
+	packadd! ultisnips
 	packadd! vim-fugitive
 	packadd! vim-json
 	packadd! vim-less
 	packadd! vim-repeat
+	packadd! vim-snippets
 	packadd! vim-surround
 	packadd! vim-tridactyl
 	packadd! vim-vinegar
 	if has('nvim')
-		packadd! nvim-lspconfig
 		packadd! deoplete.nvim
 		packadd! deoplete-abook
 		packadd! deoplete-lsp
 		packadd! deoplete-notmuch
 		packadd! firenvim
+		lua <<EOF
+		if ( vim.lsp ~= nil ) then
+			vim.cmd "packadd! nvim-lspconfig"
+		end
+EOF
 	endif
 endif
 
@@ -28,3 +35,9 @@ endif
 filetype indent plugin on " 
 " Enables filetype specific syntaxs
 syntax on
+
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+let g:UltiSnipsJumpBackwardTrigger="<S-tab>"
+
+
diff --git a/nvim/.config/nvim/pack/bundle/opt/lexima.vim b/nvim/.config/nvim/pack/bundle/opt/lexima.vim
new file mode 160000
index 00000000..89bf4dc1
--- /dev/null
+++ b/nvim/.config/nvim/pack/bundle/opt/lexima.vim
@@ -0,0 +1 @@
+Subproject commit 89bf4dc13539131a29cf938074b3f1ce9d000bfd