diff --git a/lazy-lock.json b/lazy-lock.json
index 2b6be99..157fb0d 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -16,6 +16,7 @@
   "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
   "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
+  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
@@ -38,6 +39,7 @@
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
   "statuscol.nvim": { "branch": "main", "commit": "8822f76e105549620ef9c0d96e7b95aedf14c490" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
   "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
diff --git a/lua/crentist/lazy/lsp.lua b/lua/crentist/lazy/lsp.lua
index c208b7c..7a635bb 100644
--- a/lua/crentist/lazy/lsp.lua
+++ b/lua/crentist/lazy/lsp.lua
@@ -15,6 +15,17 @@ return {
         'j-hui/fidget.nvim',
         'rafamadriz/friendly-snippets',
         { 'towolf/vim-helm', ft = 'helm' },
+        {
+            'folke/lazydev.nvim',
+            ft = 'lua', -- only load on lua files
+            opts = {
+                library = {
+                    -- See the configuration section for more details
+                    -- Load luvit types when the `vim.uv` word is found
+                    { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
+                },
+            },
+        },
     },
 
     config = function()
@@ -107,6 +118,7 @@ return {
 
         })
 
+        local capabilities = require('cmp_nvim_lsp').default_capabilities()
         local pythonLineLength = 95
         lspconfig.pylsp.setup {
             settings = {
@@ -122,37 +134,8 @@ return {
         }
         lspconfig.ansiblels.setup {}
 
-        lspconfig.lua_ls.setup {
-            on_init = function(client)
-                local path = client.workspace_folders[1].name
-                if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
-                    return
-                end
+        lspconfig.lua_ls.setup {}
 
-                client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
-                    runtime = {
-                        -- Tell the language server which version of Lua you're using
-                        -- (most likely LuaJIT in the case of Neovim)
-                        version = 'LuaJIT'
-                    },
-                    -- Make the server aware of Neovim runtime files
-                    workspace = {
-                        checkThirdParty = false,
-                        library = {
-                            vim.env.VIMRUNTIME
-                            -- Depending on the usage, you might want to add additional paths here.
-                            -- '${3rd}/luv/library'
-                            -- '${3rd}/busted/library',
-                        }
-                        -- or pull in all of 'runtimepath'. NOTE: this is a lot slower
-                        -- library = vim.api.nvim_get_runtime_file('', true)
-                    }
-                })
-            end,
-            settings = {
-                Lua = {}
-            }
-        }
         lspconfig.helm_ls.setup {
             settings = {
                 ['helm-ls'] = {
@@ -162,6 +145,11 @@ return {
                 }
             }
         }
+
+        lspconfig.yamlls.setup {
+            capabilities = capabilities,
+        }
+
         lspconfig.terraformls.setup {
             filetypes = { 'terraform', 'terraform-vars', 'tf' }
         }
diff --git a/lua/crentist/lazy/neodev.lua b/lua/crentist/lazy/neodev.lua
deleted file mode 100644
index eb4e4ca..0000000
--- a/lua/crentist/lazy/neodev.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-    { "folke/neodev.nvim", opts = {} }
-}