diff --git a/init.vim b/init.vim
index 1731784..edc7398 100644
--- a/init.vim
+++ b/init.vim
@@ -49,6 +49,8 @@ if has("nvim")
     " Problems with Syntastic in vim
     Plug 'airblade/vim-gitgutter' " git status in gutter column
 endif
+Plug 'tpope/vim-dadbod' " Modern database interface for Vim
+Plug 'radenling/vim-dispatch-neovim' " support for :Start command, needed in dadbod
 
 " html / templates
 Plug 'mattn/emmet-vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " emmet support for vim - easily create markdup wth CSS-like syntax
@@ -88,7 +90,7 @@ Plug 'nbouscal/vim-stylish-haskell', { 'for': 'haskell' }
 
 " C/C++
 Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' }
-let g:clang_library_path='/usr/lib/llvm-4.0/lib/libclang-4.0.so.1'
+let g:clang_library_path='/usr/lib/llvm-6.0/lib/libclang-6.0.so.1'
 Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] }
 
 " PHP
diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
new file mode 100644
index 0000000..06895bf
--- /dev/null
+++ b/vim/ftplugin/cpp.vim
@@ -0,0 +1,7 @@
+let g:ale_fixers = {}
+let g:ale_fixers['cpp'] = ['clang-format']
+let g:ale_fix_on_save = 1
+let g:ale_cpp_clangtidy_checks = ['*,-fuchsia*'] 
+
+setlocal shiftwidth=2
+setlocal tabstop=2