mirror of
https://github.com/jdhao/nvim-config.git
synced 2025-06-08 14:14:33 +02:00
Compare commits
No commits in common. "69643e143a72f7e98015f61faba2f2a428d9c79a" and "784b435f0e637e496e4bb541bb3d2331c2eeb47f" have entirely different histories.
69643e143a
...
784b435f0e
@ -24,9 +24,9 @@ M.colorscheme_conf = {
|
|||||||
end,
|
end,
|
||||||
gruvbox_material = function()
|
gruvbox_material = function()
|
||||||
-- foreground option can be material, mix, or original
|
-- foreground option can be material, mix, or original
|
||||||
vim.g.gruvbox_material_foreground = "original"
|
vim.g.gruvbox_material_foreground = "material"
|
||||||
--background option can be hard, medium, soft
|
--background option can be hard, medium, soft
|
||||||
vim.g.gruvbox_material_background = "medium"
|
vim.g.gruvbox_material_background = "soft"
|
||||||
vim.g.gruvbox_material_enable_italic = 1
|
vim.g.gruvbox_material_enable_italic = 1
|
||||||
vim.g.gruvbox_material_better_performance = 1
|
vim.g.gruvbox_material_better_performance = 1
|
||||||
|
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
local handler = function(virtText, lnum, endLnum, width, truncate)
|
|
||||||
local newVirtText = {}
|
|
||||||
local totalLines = vim.api.nvim_buf_line_count(0)
|
|
||||||
local foldedLines = endLnum - lnum
|
|
||||||
local suffix = (" %d"):format(foldedLines)
|
|
||||||
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
|
|
||||||
local rAlignAppndx = math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
|
|
||||||
suffix = (" "):rep(rAlignAppndx) .. suffix
|
|
||||||
table.insert(newVirtText, { suffix, "MoreMsg" })
|
|
||||||
return newVirtText
|
|
||||||
end
|
|
||||||
|
|
||||||
local opts = {}
|
|
||||||
opts["fold_virt_text_handler"] = handler
|
|
||||||
|
|
||||||
require("ufo").setup(opts)
|
|
||||||
|
|
||||||
vim.keymap.set("n", "zR", require("ufo").openAllFolds)
|
|
||||||
vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
|
|
||||||
vim.keymap.set("n", "zr", require("ufo").openFoldsExceptKinds)
|
|
||||||
vim.keymap.set("n", "<leader>K", function()
|
|
||||||
local winid = require("ufo").peekFoldedLinesUnderCursor()
|
|
||||||
if not winid then
|
|
||||||
-- vim.lsp.buf.hover()
|
|
||||||
vim.cmd([[ Lspsaga hover_doc ]])
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
@ -180,36 +180,7 @@ local plugin_specs = {
|
|||||||
require("config.indent-blankline")
|
require("config.indent-blankline")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"luukvbaal/statuscol.nvim",
|
|
||||||
opts = {},
|
|
||||||
config = function()
|
|
||||||
local builtin = require("statuscol.builtin")
|
|
||||||
require("statuscol").setup {
|
|
||||||
relculright = true,
|
|
||||||
segments = {
|
|
||||||
{ text = { builtin.foldfunc }, click = "v:lua.ScFa" },
|
|
||||||
{ text = { "%s" }, click = "v:lua.ScSa" },
|
|
||||||
{ text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"kevinhwang91/nvim-ufo",
|
|
||||||
dependencies = "kevinhwang91/promise-async",
|
|
||||||
event = "VeryLazy",
|
|
||||||
opts = {},
|
|
||||||
init = function()
|
|
||||||
vim.o.foldcolumn = "1" -- '0' is not bad
|
|
||||||
vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
|
|
||||||
vim.o.foldlevelstart = 99
|
|
||||||
vim.o.foldenable = true
|
|
||||||
end,
|
|
||||||
config = function()
|
|
||||||
require("config.nvim_ufo")
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
-- Highlight URLs inside vim
|
-- Highlight URLs inside vim
|
||||||
{ "itchyny/vim-highlighturl", event = "VeryLazy" },
|
{ "itchyny/vim-highlighturl", event = "VeryLazy" },
|
||||||
|
|
||||||
@ -471,7 +442,7 @@ local plugin_specs = {
|
|||||||
-- local prologue = "echo"
|
-- local prologue = "echo"
|
||||||
local cmd_str = string.format(":call firenvim#install(0, '%s')", prologue)
|
local cmd_str = string.format(":call firenvim#install(0, '%s')", prologue)
|
||||||
vim.cmd(cmd_str)
|
vim.cmd(cmd_str)
|
||||||
end,
|
end
|
||||||
},
|
},
|
||||||
-- Debugger plugin
|
-- Debugger plugin
|
||||||
{
|
{
|
||||||
@ -546,6 +517,6 @@ require("lazy").setup {
|
|||||||
title_pos = "center",
|
title_pos = "center",
|
||||||
},
|
},
|
||||||
rocks = {
|
rocks = {
|
||||||
enabled = false,
|
enabled = false
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,11 @@
|
|||||||
scriptencoding utf-8
|
scriptencoding utf-8
|
||||||
|
|
||||||
" change fillchars for folding, vertical split, end of buffer, and message separator
|
" change fillchars for folding, vertical split, end of buffer, and message separator
|
||||||
set fillchars=fold:\ ,foldsep:\ ,foldopen:,foldclose:,vert:\│,eob:\ ,msgsep:‾,diff:╱
|
set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾,diff:╱
|
||||||
|
|
||||||
" Split window below/right when creating horizontal/vertical windows
|
" Split window below/right when creating horizontal/vertical windows
|
||||||
set splitbelow splitright
|
set splitbelow splitright
|
||||||
|
|
||||||
" avoid the flickering when splitting window horizontal
|
|
||||||
set splitkeep=screen
|
|
||||||
|
|
||||||
" Time in milliseconds to wait for a mapped sequence to complete,
|
" Time in milliseconds to wait for a mapped sequence to complete,
|
||||||
" see https://unix.stackexchange.com/q/36882/221410 for more info
|
" see https://unix.stackexchange.com/q/36882/221410 for more info
|
||||||
set timeoutlen=500
|
set timeoutlen=500
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user