diff --git a/README.md b/README.md
index a11c774..4eb8048 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,12 @@
 + vim-plug: `curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim`
 
+### Nvim LSP
+
++ [Python](https://github.com/palantir/python-language-server)
++ [Rust](https://github.com/rust-analyzer/rust-analyzer)
++ [TeX](https://github.com/latex-lsp/texlab)
+
 ## Fonts
 + Fira Code Regular Nerd Font Complete Mono.ttf: General
 + IPAGothic.ttf: Japanese Characters
diff --git a/laptop/.gitconfig b/laptop/.gitconfig
index 245337d..3be55fc 100644
--- a/laptop/.gitconfig
+++ b/laptop/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Marco Thomas
-	email = mthomas@marcmk.de
+	email = ma_tho@web.de
 [alias]
 	aa = add .
 	st = status
diff --git a/laptop/.vimrc b/laptop/.vimrc
index 173bb2c..a85438d 100644
--- a/laptop/.vimrc
+++ b/laptop/.vimrc
@@ -9,7 +9,7 @@
 
 let mapleader = "\<Space>"
 
-" ============================== Plugins
+" ============================== vim-plug
 call plug#begin()
 
 Plug 'altercation/vim-colors-solarized' " Colorscheme
@@ -24,6 +24,8 @@ if executable("fzf")
 endif
 
 if has ("nvim")
+    Plug 'neovim/nvim-lspconfig' " language client
+    Plug 'nvim-lua/completion-nvim' " fancy autocomplete
 endif
 
 call plug#end()
@@ -96,3 +98,29 @@ iab lframe \begin{frame}{}<CR><CR>\end{frame}<UP>
 iab litem \begin{itemize}<CR><CR>\end{itemize}<UP>
 iab ltable \begin{tabular}{}<CR>\end{tabular}<UP><RIGHT><RIGHT><RIGHT>
 iab lfig \begin{figure}<CR>\includegraphics[width=1\textwidth]{}<CR>\caption{}<CR>\label{figure:}<CR>\end{figure}
+
+" ============================== LSP
+" ++++++++++ completion-nvim Settings
+if has ("nvim")
+    " Use completion-nvim in every buffer
+    autocmd BufEnter * lua require'completion'.on_attach()
+
+    " Use <Tab> and <S-Tab> to navigate through popup menu
+    inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
+    inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+
+    " Set completeopt to have a better completion experience
+    set completeopt=menuone,noinsert,noselect
+
+    " Avoid showing message extra message when using completion
+    set shortmess+=c
+endif
+
+" ++++++++++ Enable Language Servers
+if has ("nvim")
+    lua <<EOF
+    require'nvim_lsp'.pyls.setup{}
+    require'nvim_lsp'.rust_analyzer.setup{}
+    require'nvim_lsp'.texlab.setup{}
+EOF
+endif
diff --git a/laptop/.zshrc b/laptop/.zshrc
index 7b86f95..256db1e 100644
--- a/laptop/.zshrc
+++ b/laptop/.zshrc
@@ -116,7 +116,7 @@ export FZF_DEFAULT_OPTS='--preview="head {}" --layout=reverse --bind=tab:down --
 ## fzf Bindings in zsh (C-r and C-t)
 if [[ -x $(which fzf 2> /dev/null) ]]
 then
-    source ~/.vim/bundle/fzf/shell/key-bindings.zsh
+    source ~/.vim/plugged/fzf/shell/key-bindings.zsh
 else
     bindkey '^R' history-incremental-search-backward
 fi
diff --git a/screenshots/home_new.png b/screenshots/home_new.png
index 305e9ae..49642da 100644
Binary files a/screenshots/home_new.png and b/screenshots/home_new.png differ