diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua
index 07fb5f5..4639de7 100644
--- a/lua/plugins/nvim-cmp.lua
+++ b/lua/plugins/nvim-cmp.lua
@@ -1,113 +1,118 @@
-return {
-
-    {
-        "hrsh7th/nvim-cmp",
-        version = false,
-        event = "InsertEnter",
-        dependencies = {
-            "hrsh7th/cmp-nvim-lsp",
-            "hrsh7th/cmp-buffer",
-            "hrsh7th/cmp-nvim-lua",
-            "hrsh7th/cmp-path",
-            "saadparwaiz1/cmp_luasnip",
-            "hrsh7th/cmp-nvim-lsp-signature-help",
-            "onsails/lspkind.nvim",
+return { -- Autocompletion
+    "hrsh7th/nvim-cmp",
+    event = "InsertEnter",
+    dependencies = {
+        -- Snippet Engine & its associated nvim-cmp source
+        {
+            "L3MON4D3/LuaSnip",
+            build = (function()
+                -- Build Step is needed for regex support in snippets.
+                -- This step is not supported in many windows environments.
+                -- Remove the below condition to re-enable on windows.
+                if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then
+                    return
+                end
+                return "make install_jsregexp"
+            end)(),
+            dependencies = {
+                -- `friendly-snippets` contains a variety of premade snippets.
+                --    See the README about individual language/framework/plugin snippets:
+                --    https://github.com/rafamadriz/friendly-snippets
+                -- {
+                --   'rafamadriz/friendly-snippets',
+                --   config = function()
+                --     require('luasnip.loaders.from_vscode').lazy_load()
+                --   end,
+                -- },
+            },
         },
-        config = function()
-            vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
-            local luasnip = require("luasnip")
-            local cmp = require("cmp")
+        "saadparwaiz1/cmp_luasnip",
 
-            local border_opts = {
-                border = {
-                    { "╭", "CmpDocBorder" },
-                    { "─", "CmpDocBorder" },
-                    { "╮", "CmpDocBorder" },
-                    { "│", "CmpDocBorder" },
-                    { "╯", "CmpDocBorder" },
-                    { "─", "CmpDocBorder" },
-                    { "╰", "CmpDocBorder" },
-                    { "│", "CmpDocBorder" },
-                },
-                winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None",
-            }
-            ---@diagnostic disable: missing-fields
-            cmp.setup({
-                formatting = {
-                    preselect = cmp.PreselectMode.None,
-                    fields = {
-                        "abbr",
-                        "kind",
-                        "menu",
-                    },
-                    format = require("lspkind").cmp_format({
-                        mode = "symbol_text",
-                        maxwidth = 150,
-                        ellipsis_char = "...",
-                        before = function(entry, vim_item)
-                            vim_item.menu = ({
-                                nvim_lsp = "[LSP]",
-                                buffer = "[Buffer]",
-                            })[entry.source.name]
-                            return vim_item
-                        end,
-                    }),
-                },
-                completion = {
-                    completeopt = "menu,menuone,noinsert",
-                },
-                snippet = {
-                    expand = function(args)
-                        luasnip.lsp_expand(args.body)
-                    end,
-                },
-                view = {
-                    docs = {
-                        auto_open = true,
-                    },
-                },
-                mapping = cmp.mapping.preset.insert({
-                    ["<C-j>"] = cmp.mapping.select_next_item(),
-                    ["<C-k>"] = cmp.mapping.select_prev_item(),
-                    ["<C-Space>"] = cmp.mapping.complete(),
-                    ["<C-e>"] = cmp.mapping.abort(),
-                    ["<CR>"] = cmp.mapping.confirm({ behavior = cmp.SelectBehavior.Replace, select = true }),
-                    ["<Tab>"] = cmp.mapping(function(fallback)
-                        if cmp.visible() then
-                            cmp.select_next_item()
-                        else
-                            fallback()
-                        end
-                    end, { "i", "s" }),
-                    ["<S-Tab>"] = cmp.mapping(function(fallback)
-                        if cmp.visible() then
-                            cmp.select_prev_item()
-                        else
-                            fallback()
-                        end
-                    end, { "i", "s" }),
-                    ["<C-d>"] = function()
-                        if cmp.visible_docs() then
-                            cmp.close_docs()
-                        else
-                            cmp.open_docs()
-                        end
-                    end,
-                }),
-                sources = cmp.config.sources({
-                    { name = "nvim_lsp" },
-                    { name = "nvim_lsp_signature_help" },
-                    { name = "luasnip" },
-                    { name = "buffer" },
-                    { name = "path" },
-                }),
-                window = {
-                    scrollbar = false,
-                    completion = cmp.config.window.bordered(border_opts),
-                    documentation = cmp.config.window.bordered(border_opts),
-                },
-            })
-            ---@diagnostic enable: missing-fields
-        end,
+        -- Adds other completion capabilities.
+        --  nvim-cmp does not ship with all sources by default. They are split
+        --  into multiple repos for maintenance purposes.
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-path",
+        "hrsh7th/cmp-nvim-lsp-signature-help",
     },
+    config = function()
+        -- See `:help cmp`
+        local cmp = require("cmp")
+        local luasnip = require("luasnip")
+        luasnip.config.setup({})
+
+        cmp.setup({
+            snippet = {
+                expand = function(args)
+                    luasnip.lsp_expand(args.body)
+                end,
+            },
+            completion = { completeopt = "menu,menuone,noinsert" },
+
+            -- For an understanding of why these mappings were
+            -- chosen, you will need to read `:help ins-completion`
+            --
+            -- No, but seriously. Please read `:help ins-completion`, it is really good!
+            mapping = cmp.mapping.preset.insert({
+                -- Select the [n]ext item
+                ["<C-j>"] = cmp.mapping.select_next_item(),
+                -- Select the [p]revious item
+                ["<C-k>"] = cmp.mapping.select_prev_item(),
+
+                -- Scroll the documentation window [b]ack / [f]orward
+                ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+                ["<C-f>"] = cmp.mapping.scroll_docs(4),
+
+                -- Accept ([y]es) the completion.
+                --  This will auto-import if your LSP supports it.
+                --  This will expand snippets if the LSP sent a snippet.
+                -- ["<C-y>"] = cmp.mapping.confirm({ select = true }),
+
+                -- If you prefer more traditional completion keymaps,
+                -- you can uncomment the following lines
+                ["<CR>"] = cmp.mapping.confirm({ select = true }),
+                --['<Tab>'] = cmp.mapping.select_next_item(),
+                --['<S-Tab>'] = cmp.mapping.select_prev_item(),
+
+                -- Manually trigger a completion from nvim-cmp.
+                --  Generally you don't need this, because nvim-cmp will display
+                --  completions whenever it has completion options available.
+                ["<C-Space>"] = cmp.mapping.complete({}),
+
+                -- Think of <c-l> as moving to the right of your snippet expansion.
+                --  So if you have a snippet that's like:
+                --  function $name($args)
+                --    $body
+                --  end
+                --
+                -- <c-l> will move you to the right of each of the expansion locations.
+                -- <c-h> is similar, except moving you backwards.
+                ["<C-l>"] = cmp.mapping(function()
+                    if luasnip.expand_or_locally_jumpable() then
+                        luasnip.expand_or_jump()
+                    end
+                end, { "i", "s" }),
+                ["<C-h>"] = cmp.mapping(function()
+                    if luasnip.locally_jumpable(-1) then
+                        luasnip.jump(-1)
+                    end
+                end, { "i", "s" }),
+
+                -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
+                --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
+            }),
+            sources = {
+                {
+                    name = "lazydev",
+                    -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
+                    group_index = 0,
+                },
+                { name = "nvim_lsp" },
+                { name = "nvim_lsp_signature_help" },
+                { name = "luasnip" },
+                { name = "path" },
+                { name = "nvim_lsp_signature_help" },
+            },
+        })
+    end,
 }