diff --git a/lua/nvchad/configs/lspconfig.lua b/lua/nvchad/configs/lspconfig.lua
index 96e6ba2..e80b190 100644
--- a/lua/nvchad/configs/lspconfig.lua
+++ b/lua/nvchad/configs/lspconfig.lua
@@ -80,6 +80,8 @@ M.defaults = function()
           library = {
             [vim.fn.expand "$VIMRUNTIME/lua"] = true,
             [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
+            [vim.fn.stdpath "data" .. "/lazy/ui/nvchad_types"] = true,
+            [vim.fn.stdpath "data" .. "/lazy/lazy.nvim/lua/lazy"] = true,
           },
           maxPreload = 100000,
           preloadFileSize = 10000,
diff --git a/lua/nvchad/mappings.lua b/lua/nvchad/mappings.lua
index 3bd56cf..3342751 100644
--- a/lua/nvchad/mappings.lua
+++ b/lua/nvchad/mappings.lua
@@ -21,11 +21,11 @@ map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "Toggle Line number" })
 map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle Relative number" })
 map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Toggle NvCheatsheet" })
 
--- global lsp mappings
 map("n", "<leader>fm", function()
-  vim.lsp.buf.format { async = true }
-end, { desc = "Lsp formatting" })
+  require("conform").format { lsp_fallback = true }
+end, { desc = "Format Files" })
 
+-- global lsp mappings
 map("n", "<leader>lf", vim.diagnostic.open_float, { desc = "Lsp floating diagnostics" })
 map("n", "[d", vim.diagnostic.goto_prev, { desc = "Lsp prev diagnostic" })
 map("n", "]d", vim.diagnostic.goto_next, { desc = "Lsp next diagnostic" })
diff --git a/lua/nvchad/plugins/init.lua b/lua/nvchad/plugins/init.lua
index 021bba3..4669a3d 100644
--- a/lua/nvchad/plugins/init.lua
+++ b/lua/nvchad/plugins/init.lua
@@ -2,6 +2,19 @@ return {
 
   "nvim-lua/plenary.nvim",
 
+  -- formatting!
+  {
+    "stevearc/conform.nvim",
+    opts = {
+      formatters_by_ft = {
+        lua = { "stylua" },
+      },
+    },
+    config = function(_, opts)
+      require("conform").setup(opts)
+    end,
+  },
+
   {
     "nvim-treesitter/nvim-treesitter",
     event = { "BufReadPost", "BufNewFile" },