diff --git a/.vimrc b/.vimrc
index 0d8b983..5f11ee8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,10 +9,16 @@ call vundle#begin()
     Plugin 'airblade/vim-gitgutter'
     Plugin 'altercation/vim-colors-solarized'
     Plugin 'cespare/vim-toml'
+    Plugin 'Chiel92/vim-autoformat'
+    Plugin 'deoplete-plugins/deoplete-clang'
+    Plugin 'deoplete-plugins/deoplete-docker'
+    Plugin 'deoplete-plugins/deoplete-jedi'
     Plugin 'ludovicchabant/vim-gutentags'
     Plugin 'mhinz/vim-startify'
     Plugin 'sakhnik/nvim-gdb'
     Plugin 'scrooloose/nerdtree'
+    Plugin 'Shougo/deoplete.nvim'
+    Plugin 'Shougo/neoinclude.vim'
     Plugin 'suan/vim-instant-markdown'
     Plugin 'tpope/vim-fugitive'
     Plugin 'tpope/vim-sleuth'
@@ -20,13 +26,10 @@ call vundle#begin()
     Plugin 'vim-airline/vim-airline-themes'
     Plugin 'vim-scripts/nginx.vim'
     Plugin 'wincent/terminus'
-    Plugin 'Xuyuanp/nerdtree-git-plugin'
-    Plugin 'Shougo/deoplete.nvim'
-    Plugin 'Shougo/neoinclude.vim'
     Plugin 'wokalski/autocomplete-flow'
-    Plugin 'deoplete-plugins/deoplete-jedi'
-    Plugin 'deoplete-plugins/deoplete-clang'
-    Plugin 'deoplete-plugins/deoplete-docker'
+    Plugin 'xolox/vim-lua-ftplugin'
+    Plugin 'xolox/vim-misc'
+    Plugin 'Xuyuanp/nerdtree-git-plugin'
     if !has('nvim')
         Plugin 'roxma/nvim-yarp'
         Plugin 'roxma/vim-hug-neovim-rpc'
@@ -45,6 +48,11 @@ let g:airline#extensions#tabline#enabled = 1
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-default/lib/libclang.so.1'
 let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-default/lib/clang/default/include'
+let g:lua_check_syntax = 0
+let g:lua_complete_omni = 1
+let g:lua_complete_dynamic = 0
+let g:lua_define_completion_mappings = 0
+call deoplete#custom#var('omni', 'functions', {'lua': 'xolox#lua#omnifunc',})
 set encoding=utf-8
 set icon
 set smartcase
@@ -56,7 +64,7 @@ set number
 set foldmethod=indent
 set foldnestmax=10
 set nofoldenable
-set nomodeline
+"set nomodeline
 set ruler
 set listchars=eol:¶,tab:\»\ ,trail:~,extends:>,precedes:<
 set list