diff --git a/lazy-lock.json b/lazy-lock.json
index c9df74b..5b42fce 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,8 +1,9 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "8f3d3465ba5c7ade0a8adb41eca5736f291a3fa8" },
+  "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
   "bufferline.nvim": { "branch": "main", "commit": "73540cb95f8d95aa1af3ed57713c6720c78af915" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" },
   "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
@@ -17,19 +18,19 @@
   "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
   "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" },
   "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
-  "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
-  "mini.surround": { "branch": "main", "commit": "a00d69be09e3fe27dfa9e5b0298410d0e148e3e2" },
+  "mini.pairs": { "branch": "main", "commit": "5c975d8f68dc1e11bf4b20ced71e7987ed782513" },
+  "mini.surround": { "branch": "main", "commit": "0f528eb2e1bab420c0569d9e52615144c51db920" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
   "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
   "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
   "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
   "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
-  "nvim-lint": { "branch": "master", "commit": "f098232d70cebe90e27404928c9bc19ca7a5a7b5" },
+  "nvim-lint": { "branch": "master", "commit": "861a04313501563bb1b11f125ae9b7237a517b9b" },
   "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
-  "nvim-treesitter": { "branch": "master", "commit": "160e5d52c841dc9261c0b2dc6f253bddbcf3d766" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "4fe0a54e86859744968e1a5c7867b49c86855774" },
+  "nvim-treesitter": { "branch": "master", "commit": "b1f3f02027f1fd21956c1e219878764014498a59" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
   "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" },
   "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua
index 0e0ab2a..5698b27 100644
--- a/lua/plugins/coding.lua
+++ b/lua/plugins/coding.lua
@@ -1,7 +1,10 @@
 return {
     {
         "hrsh7th/nvim-cmp",
-        dependencies = { "hrsh7th/cmp-nvim-lsp" },
+        dependencies = {
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-buffer",
+        },
         config = function()
             local cmp = require("cmp")
 
@@ -30,16 +33,13 @@ return {
                             fallback()
                         end
                     end, { "i" }),
-                    ["<CR>"] = cmp.mapping.confirm({
-                        behaviour = cmp.ConfirmBehavior.Insert,
-                        select = true,
-                    }),
+                    ["<CR>"] = cmp.mapping.confirm({ select = true }),
                 }),
 
                 snippet = {
                     expand = function(args)
-                        require("luasnip").lsp_expand(args.body)
-                    end,
+                        require('luasnip').lsp_expand(args.body)
+                    end
                 },
 
                 sources = cmp.config.sources({
diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 13ee7e6..e251f33 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -1,6 +1,7 @@
 return {
     {
         "nvim-neo-tree/neo-tree.nvim",
+        event = "VeryLazy",
         branch = "v3.x",
         dependencies = {
             "nvim-lua/plenary.nvim",
@@ -22,6 +23,7 @@ return {
                         hide_gitignored = true,
                         always_show = {
                             ".env",
+                            ".env.local",
                         },
                         never_show = {
                             ".git",
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index d94564a..860226c 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -37,18 +37,16 @@ return {
         opts = {
             servers = {
                 tsserver = {},
-                lua_ls = {}
+                lua_ls = {},
             }
         },
         config = function(_, opts)
             local lspconfig = require("lspconfig")
-            local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
             local servers = opts.servers
 
             for server, server_opts in pairs(servers) do
-                local sopts = vim.tbl_deep_extend("force", server_opts, capabilities)
-                lspconfig[server].setup(sopts)
+                lspconfig[server].setup(server_opts)
             end
 
             vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" })