diff --git a/stowers/nvim/dot-config/nvim/lazy-lock.json b/stowers/nvim/dot-config/nvim/lazy-lock.json
index 38c7009..01a8f41 100644
--- a/stowers/nvim/dot-config/nvim/lazy-lock.json
+++ b/stowers/nvim/dot-config/nvim/lazy-lock.json
@@ -1,19 +1,21 @@
 {
   "blamer.nvim": { "branch": "master", "commit": "920eee3913091bd929d83e7bf52a815351a0559c" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neovim": { "branch": "main", "commit": "14b371fb783a8cfdade04544fb782f0bb6f7c904" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
-  "nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4ae9796c4e95ca84ec77946a9f9089b8f1a3eec9" },
+  "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7b0a2f6b14485bb5a237fc1328a487ff3e4a08c5" },
   "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" },
   "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" },
-  "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" },
+  "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "schemastore.nvim": { "branch": "main", "commit": "3944983d4194a29730742c908e58b48ad1f51cbf" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" }
 }
diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua
index 665b609..2359176 100644
--- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua
+++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua
@@ -1,5 +1,3 @@
-require('eyedevelop.remap')
-
-require('eyedevelop.pm')
-require('eyedevelop.settings')
-
+require("eyedevelop.remap")
+require("eyedevelop.pm")
+require("eyedevelop.settings")
diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua
index 332543e..c51a7ee 100644
--- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua
+++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/plugins/code.lua
@@ -71,7 +71,39 @@ return {
     {
         "williamboman/mason-lspconfig.nvim",
         lazy = true,
-        config = true,
+        config = function()
+            require("mason-lspconfig").setup({})
+            require("mason-lspconfig").setup_handlers({
+                function (server_name)
+                    require("lspconfig")[server_name].setup({})
+                end,
+
+                ["yamlls"] = function()
+                    require("lspconfig").yamlls.setup({
+                        settings = {
+                            yaml = {
+                                schemaStore = {
+                                    enable = false,
+                                    url = "",
+                                },
+                                schemas = require("schemastore").yaml.schemas(),
+                            },
+                        },
+                    })
+                end,
+
+                ["jsonls"] = function()
+                    require("lspconfig").jsonls.setup({
+                        settings = {
+                            json = {
+                                schemas = require("schemastore").json.schemas(),
+                                validate = { enable = true, },
+                            },
+                        },
+                    })
+                end,
+            })
+        end,
     },
 
     {
@@ -86,6 +118,7 @@ return {
         event = { "BufReadPre", "BufNewFile", },
         dependencies = {
             { "hrsh7th/nvim-cmp" },
+            { "hrsh7th/cmp-nvim-lsp" },
             { "williamboman/mason.nvim" },
             { "williamboman/mason-lspconfig.nvim" },
             { "b0o/schemastore.nvim" },
@@ -110,7 +143,7 @@ return {
                     vim.keymap.set({ "n", "i" }, "<C-p>", "<cmd>lua vim.lsp.buf.signature_help()<cr>", opts)
                     vim.keymap.set("n", "<leader>cr", "<cmd>lua vim.lsp.buf.rename()<cr>", opts)
                     vim.keymap.set("n", "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<cr>", opts)
-                    vim.keymap.set({ "n", "x" }, "<leader>cf", "<cmd>lua vim.lsp.format({async = true})<cr>", opts)
+                    vim.keymap.set({ "n", "x" }, "<leader>cf", "<cmd>lua vim.lsp.buf.format({async = true})<cr>", opts)
 
                     vim.keymap.set("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>", opts)
                     vim.keymap.set("n", "gd", "<cmd>lua vim.lsp.buf.definition()<cr>", opts)
@@ -120,27 +153,25 @@ return {
                     vim.keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<cr>", opts)
                 end,
             })
-
-            require("lspconfig").yamlls.setup({
-                settings = {
-                    yaml = {
-                        schemaStore = {
-                            enable = false,
-                            url = "",
-                        },
-                        schemas = require("schemastore").yaml.schemas(),
-                    },
-                },
-            })
-
-            require("lspconfig").jsonls.setup({
-                settings = {
-                    json = {
-                        schemas = require("schemastore").json.schemas(),
-                        validate = { enable = true, },
-                    },
-                },
-            })
         end,
     },
+
+    {
+        "folke/trouble.nvim",
+        tag = "v3.6.0",
+        opts = {},
+        cmd = "Trouble",
+        keys = {
+            {
+                "<leader>ct",
+                "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+                desc = "Show errors for current file",
+            },
+            {
+                "<leader>cT",
+                "<cmd>Trouble diagnostics toggle<cr>",
+                desc = "Show diagnostics for project",
+            },
+        },
+    },
 }