diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua
index 9d6c13be..5fff21d7 100644
--- a/home/.config/nvim/init.lua
+++ b/home/.config/nvim/init.lua
@@ -1,10 +1,10 @@
 require 'autocmd'
 require 'keybinds'
-require 'pluginmanager'
 require 'settings'
+require 'pluginmanager'
 
 -- Plugin configurations
-require 'plugins/airline'
-require 'plugins/lsp'
-require 'plugins/nerdtree'
-require 'plugins/treesitter'
+--require 'pluginconf.airline'
+require 'pluginconf.completion'
+require 'pluginconf.lsp'
+require 'pluginconf.treesitter'
diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua
index b8942423..2ddf29d9 100644
--- a/home/.config/nvim/lua/keybinds.lua
+++ b/home/.config/nvim/lua/keybinds.lua
@@ -9,3 +9,7 @@ map('n', '<C-t>', '<cmd>NERDTreeToggle<CR>')
 -- FZF
 map('n', '<C-f>', '<cmd>Files<CR>')
 map('n', '<C-g>', '<cmd>Rg<CR>')
+
+-- Completion
+map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"')
+map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<S-Tab>"')
diff --git a/home/.config/nvim/lua/plugins/airline.lua b/home/.config/nvim/lua/pluginconf/airline.lua
similarity index 100%
rename from home/.config/nvim/lua/plugins/airline.lua
rename to home/.config/nvim/lua/pluginconf/airline.lua
diff --git a/home/.config/nvim/lua/pluginconf/completion.lua b/home/.config/nvim/lua/pluginconf/completion.lua
new file mode 100644
index 00000000..9d2c2d25
--- /dev/null
+++ b/home/.config/nvim/lua/pluginconf/completion.lua
@@ -0,0 +1,3 @@
+local o = vim.o
+
+o.completeopt = 'menuone,noinsert,noselect'
diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua
new file mode 100644
index 00000000..d8bfb68e
--- /dev/null
+++ b/home/.config/nvim/lua/pluginconf/lsp.lua
@@ -0,0 +1,29 @@
+require'lspconfig'.rust_analyzer.setup {
+    on_attach = require'completion'.on_attach
+}
+
+local sumneko_binary = '/usr/bin/lua-language-server'
+require'lspconfig'.sumneko_lua.setup {
+    cmd = {sumneko_binary},
+    settings = {
+        Lua = {
+            runtime = {
+                -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+                version = 'LuaJIT',
+                -- Setup your lua path
+                path = vim.split(package.path, ';')
+            },
+            diagnostics = {
+                -- Get the language server to recognize the `vim` global
+                globals = {'vim'}
+            },
+            workspace = {
+                -- Make the server aware of Neovim runtime files
+                library = {
+                    [vim.fn.expand('$VIMRUNTIME/lua')] = true,
+                    [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true
+                }
+            }
+        }
+    }
+}
diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/pluginconf/treesitter.lua
similarity index 100%
rename from home/.config/nvim/lua/plugins/treesitter.lua
rename to home/.config/nvim/lua/pluginconf/treesitter.lua
diff --git a/home/.config/nvim/lua/plugins/completion.lua b/home/.config/nvim/lua/plugins/completion.lua
deleted file mode 100644
index 2f991d6c..00000000
--- a/home/.config/nvim/lua/plugins/completion.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd "autocmd BufEnter * lua require'completion'.on_attach()"
diff --git a/home/.config/nvim/lua/plugins/lsp.lua b/home/.config/nvim/lua/plugins/lsp.lua
deleted file mode 100644
index 770220e6..00000000
--- a/home/.config/nvim/lua/plugins/lsp.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-local cmd = vim.cmd
-
-require'lspconfig'.rust_analyzer.setup {}