diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index a906665..194a2c9 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -122,12 +122,13 @@ map("n", "<leader>lc", function()
     vim.wo.list = not vim.wo.list
 end)
 
+-- [[ AUTOCMDS ]] --
+
 -- Hightlight copied text
 vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function() vim.highlight.on_yank() end
 })
 
-
 -- [[ PLUGINS ]] --
 
 -- Install plugins
@@ -167,26 +168,36 @@ vim.pack.add({
    "https://github.com/neovim/nvim-lspconfig",
    "https://github.com/mason-org/mason.nvim",
    "https://github.com/mason-org/mason-lspconfig.nvim",
+
+   -- Autocompletion
+   { src = "https://github.com/saghen/blink.cmp", version = "v1" }
 })
 vim.cmd.packadd("nvim.undotree")
 vim.cmd.packadd("nvim.difftool")
 
--- Configure plugins
+-- [[ PLUGINS CONFIGURATIONS ]] --
+
 cmd.colorscheme("gruber-darker")
+
 require("mini.pick").setup()
+
 require("multiple-cursors").setup()
+
 require("retrail").setup({
     hlgroup = "Error",
     trim = {
         auto = false, -- Auto trim on BufWritePre
     }
 })
+
 require("ibl").setup()
+
 require("neo-tree").setup({
     window = {
         width = 32
     }
 })
+
 require("mason").setup()
 require("mason-lspconfig").setup()
 vim.lsp.config("lua_ls", {
@@ -211,7 +222,11 @@ vim.lsp.config("lua_ls", {
     }
 })
 
--- Plugin keymaps
+require("blink.cmp").setup({
+    fuzzy = { implementation = "lua" }
+})
+
+-- [[ PLUGIN KEYMAPS ]] --
 map("n", "<leader>f", ":Pick files<CR>")
 map("n", "<leader>b", ":Pick buffers<CR>")
 
@@ -238,3 +253,5 @@ map("n", "<leader>|", function()
 end)
 
 map("n", "<leader>p", "<cmd>Neotree toggle<CR>")
+
+map("n", "grd", vim.diagnostic.open_float)