diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua
index cef30b9c..711415bd 100644
--- a/home/.config/nvim/init.lua
+++ b/home/.config/nvim/init.lua
@@ -1,7 +1,7 @@
+require 'pluginmanager'
 require 'autocmd'
 require 'keybinds'
 require 'settings'
-require 'pluginmanager'
 
 -- Plugin configurations
 require 'pluginconf.airline'
diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/autocmd.lua
index 93e04708..00a0940c 100644
--- a/home/.config/nvim/lua/autocmd.lua
+++ b/home/.config/nvim/lua/autocmd.lua
@@ -2,3 +2,6 @@ local cmd = vim.cmd
 
 -- Remap exit terminal mode to esc
 cmd('au TermOpen * tnoremap <buffer> <Esc> <c-\\><c-n>')
+
+-- Fix YAML indentation
+cmd('au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab')
diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua
index 72681694..25234f6c 100644
--- a/home/.config/nvim/lua/keybinds.lua
+++ b/home/.config/nvim/lua/keybinds.lua
@@ -12,8 +12,11 @@ map('n', '<C-f>', '<cmd>Files<CR>')
 map('n', '<C-g>', '<cmd>Rg<CR>')
 
 -- Completion
+-- Navigate completions with tab and shift tab
 map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', {expr = true})
 map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', {expr = true})
+-- Trigger completion
+map('i', '<C-SPACE>', '<Plug>(completion_trigger)', {silent = true, expr = true})
 
 -- Navigate between buffers
 map('n', '<C-N>', ':bn<CR>', {silent = true})
diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua
index 5e8bb449..85d57868 100644
--- a/home/.config/nvim/lua/pluginconf/lsp.lua
+++ b/home/.config/nvim/lua/pluginconf/lsp.lua
@@ -4,10 +4,9 @@ require'lspconfig'.rust_analyzer.setup {
 }
 
 -- Lua
-local sumneko_binary = '/usr/bin/lua-language-server'
 require'lspconfig'.sumneko_lua.setup {
     on_attach = require'completion'.on_attach,
-    cmd = {sumneko_binary},
+    cmd = {'/usr/bin/lua-language-server'},
     settings = {
         Lua = {
             runtime = {
diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua
index 7cf0540e..492d761b 100644
--- a/home/.config/nvim/lua/pluginmanager.lua
+++ b/home/.config/nvim/lua/pluginmanager.lua
@@ -13,6 +13,7 @@ end
 
 -- Configure packer
 cmd 'packadd packer.nvim'
+local use = require('packer').use
 require('packer').startup(function()
 
     -- The plugin manager itself
@@ -45,6 +46,7 @@ require('packer').startup(function()
 
     -- Formatter plugin
     use 'sbdchd/neoformat'
+
 end)
 
 -- Install plugins if packer was not installed