diff --git a/lua/custom/plugins/nvimufo.lua b/lua/custom/plugins/nvimufo.lua index f376fb9..bf73934 100644 --- a/lua/custom/plugins/nvimufo.lua +++ b/lua/custom/plugins/nvimufo.lua @@ -18,7 +18,7 @@ return { segments = { { text = { "%s" }, click = "v:lua.ScSa" }, { - text = { builtin.foldfunc }, + text = { builtin.foldfunc, " " }, condition = { builtin.not_empty, true, builtin.not_empty }, click = "v:lua.ScFa", }, @@ -37,12 +37,15 @@ return { vim.o.foldlevelstart = 99 vim.o.foldenable = true -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] - vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] - + -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]] + -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep:│,foldclose:]] + -- vim.o.fillchars = [[eob: ,fold: ,foldopen:󰛲,foldsep:│,foldclose:󰜄]] + vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep:│,foldclose:]] -- these are "extra", change them as you like vim.keymap.set("n", "zR", require("ufo").openAllFolds) vim.keymap.set("n", "zM", require("ufo").closeAllFolds) vim.cmd("highlight FoldColumn guifg=" .. vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("Comment")), "fg")) + -- vim.cmd("highlight FoldColumn guifg=" .. vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("IblIndent")), "fg")) -- Option 3: treesitter as a main provider instead -- Only depend on `nvim-treesitter/queries/filetype/folds.scm`, -- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()` diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 029d418..d7083bb 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -458,6 +458,9 @@ return { -- Visual = { bg = "$orange" }, DiffText = { bg = "$orange" }, DiffAdd = { bg = "#595d65" }, + -- UfoPreviewNormal = { fg = "#373d48", bg = "$bg0" }, + -- UfoPreviewBorder = { fg = "#373d48", bg = "$bg0" }, + -- UfoPreviewCursorLine = { fg = "#373d48", bg = "$bg0" }, }, transparent = transparent, lualine = { diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua index c110f29..e0e6bbf 100644 --- a/lua/user/nvim-tree.lua +++ b/lua/user/nvim-tree.lua @@ -142,7 +142,8 @@ nvim_tree.setup({ }, git = { deleted = icons.git.FileDeleted, - ignored = icons.git.FileIgnored, + -- ignored = icons.git.FileIgnored, + ignored = "", renamed = icons.git.FileRenamed, staged = icons.git.FileStaged, unmerged = icons.git.FileUnmerged,