diff --git a/.vimrc b/.vimrc
index 76a9809..e071941 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,6 +13,8 @@ else
     let &t_EI = "\<Esc>[2 q"
 endif
 
+let g:ycm_confirm_extra_conf = 0
+
 call plug#begin($VIMHOME.'/plugged')
 
 Plug 'terryma/vim-multiple-cursors'
@@ -24,23 +26,36 @@ Plug 'lervag/vimtex'
 Plug 'eagletmt/neco-ghc'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'tpope/vim-surround'
-" Plug 'Valloric/YouCompleteMe'
+Plug 'airblade/vim-gitgutter'
+Plug 'autozimu/LanguageClient-neovim', {
+    \ 'branch': 'next',
+    \ 'do': 'powershell -executionpolicy bypass -File install.ps1',
+    \ }
+Plug 'Valloric/YouCompleteMe'
 " Plug 'scrooloose/nerdtree'
 
 call plug#end()
 
 set colorcolumn=80,120
 
+if filereadable("~/.local.vimrc")
+    source "~/.local.vimrc"
+endif
+
 "
 " My own config
 "
-let g:ycm_global_ycm_extra_conf = "~\vimfiles\.ycm_extra_conf.py"
-let g:ycm_autoclose_preview_window_after_insertion = 1
-
 let g:airline_powerline_fonts = 1
 let g:airline_theme = "tender"
 let g:airline#extensions#tabline#enabled = 1
 
+" Required for operations modifying multiple buffers like rename.
+set hidden
+
+let g:LanguageClient_serverCommands = {
+    \ 'php': ['php', $VIMHOME.'/plugged/php-language-server/vendor/felixfbecker/language-server/bin/php-language-server.php']
+    \ }
+
 set splitbelow
 set shellslash
 
@@ -114,6 +129,12 @@ let g:vimtex_view_general_options
 
 let g:running = 1
 
+" no arrows
+nnoremap <Left> <Nop>
+nnoremap <Right> <Nop>
+nnoremap <Up> <Nop>
+nnoremap <Down> <Nop>
+
 set completeopt=longest,menuone
 inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
 
@@ -138,3 +159,13 @@ nnoremap <space>a ggVG
 
 vnoremap > >gv
 vnoremap < <gv
+
+command! SetCwd :cd %:p:h
+
+nnoremap <F6> :SetCwd<CR>
+
+map <F5> :set rnu!<CR>
+map <C-F5> :source ~/.vimrc<CR>
+
+vnoremap gO "py<Esc>:e <C-R>p<CR>
+vnoremap gT "py<Esc>:tabe <C-R>p<CR>