diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua
new file mode 100644
index 00000000..5ed0fac4
--- /dev/null
+++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/nvim-ufo.lua
@@ -0,0 +1,44 @@
+vim.o.foldcolumn = "1"
+vim.o.foldlevel = 99
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true
+
+-- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself
+vim.keymap.set("n", "zR", require("ufo").openAllFolds)
+vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
+
+-- Show numbers for fold text
+local handler = function(virtText, lnum, endLnum, width, truncate)
+    local newVirtText = {}
+    local suffix = ("  %d "):format(endLnum - lnum)
+    local sufWidth = vim.fn.strdisplaywidth(suffix)
+    local targetWidth = width - sufWidth
+    local curWidth = 0
+    for _, chunk in ipairs(virtText) do
+        local chunkText = chunk[1]
+        local chunkWidth = vim.fn.strdisplaywidth(chunkText)
+        if targetWidth > curWidth + chunkWidth then
+            table.insert(newVirtText, chunk)
+        else
+            chunkText = truncate(chunkText, targetWidth - curWidth)
+            local hlGroup = chunk[2]
+            table.insert(newVirtText, {chunkText, hlGroup})
+            chunkWidth = vim.fn.strdisplaywidth(chunkText)
+            -- str width returned from truncate() may less than 2nd argument, need padding
+            if curWidth + chunkWidth < targetWidth then
+                suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
+            end
+            break
+        end
+        curWidth = curWidth + chunkWidth
+    end
+    table.insert(newVirtText, {suffix, "CursorLineNR"})
+    return newVirtText
+end
+
+require("ufo").setup({
+    provider_selector = function(bufnr, filetype, buftype)
+        return {"treesitter", "indent"}
+    end,
+    fold_virt_text_handler = handler
+})
diff --git a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua
index 41c2c03f..fc1da2b9 100755
--- a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua
@@ -386,13 +386,11 @@ lazy.setup({
     },
 
     {
-        "anuvyklack/pretty-fold.nvim",
-        event = "VeryLazy",
-        dependencies = "anuvyklack/nvim-keymap-amend",
+        "kevinhwang91/nvim-ufo",
+        dependencies = { "kevinhwang91/promise-async" },
+        after = "nvim-treesitter",
         config = function()
-            require("pretty-fold").setup({
-                fill_char = " ",
-            })
+            require("plugins.configs.nvim-ufo")
         end,
     },