mirror of
https://github.com/jdhao/nvim-config.git
synced 2025-06-08 14:14:33 +02:00
Compare commits
5 Commits
e6f95cedb1
...
cfc0089bb5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cfc0089bb5 | ||
|
|
f1062a3d8f | ||
|
|
fd6df981cd | ||
|
|
8af8ebd72a | ||
|
|
4c697d89f3 |
@ -110,6 +110,11 @@ local custom_attach = function(client, bufnr)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
-- required by nvim-ufo
|
||||||
|
capabilities.textDocument.foldingRange = {
|
||||||
|
dynamicRegistration = false,
|
||||||
|
lineFoldingOnly = true
|
||||||
|
}
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
|
|
||||||
|
|||||||
23
lua/config/nvim-statuscol.lua
Normal file
23
lua/config/nvim-statuscol.lua
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
local builtin = require("statuscol.builtin")
|
||||||
|
local ffi = require("statuscol.ffidef")
|
||||||
|
local C = ffi.C
|
||||||
|
|
||||||
|
-- only show fold level up to this level
|
||||||
|
local fold_level_limit = 2
|
||||||
|
local function foldfunc(args)
|
||||||
|
local foldinfo = C.fold_info(args.wp, args.lnum)
|
||||||
|
if foldinfo.level > fold_level_limit then
|
||||||
|
return " "
|
||||||
|
end
|
||||||
|
|
||||||
|
return builtin.foldfunc(args)
|
||||||
|
end
|
||||||
|
|
||||||
|
require("statuscol").setup {
|
||||||
|
relculright = false,
|
||||||
|
segments = {
|
||||||
|
{ text = { "%s" }, click = "v:lua.ScSa" },
|
||||||
|
{ text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
|
||||||
|
{ text = { foldfunc, " " }, condition = { true, builtin.not_empty }, click = "v:lua.ScFa" },
|
||||||
|
},
|
||||||
|
}
|
||||||
@ -30,10 +30,9 @@ local handler = function(virtText, lnum, endLnum, width, truncate)
|
|||||||
return newVirtText
|
return newVirtText
|
||||||
end
|
end
|
||||||
|
|
||||||
local opts = {}
|
require("ufo").setup {
|
||||||
opts["fold_virt_text_handler"] = handler
|
fold_virt_text_handler = handler,
|
||||||
|
}
|
||||||
require("ufo").setup(opts)
|
|
||||||
|
|
||||||
vim.keymap.set("n", "zR", require("ufo").openAllFolds)
|
vim.keymap.set("n", "zR", require("ufo").openAllFolds)
|
||||||
vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
|
vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
|
||||||
|
|||||||
@ -156,7 +156,7 @@ local plugin_specs = {
|
|||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
cond = firenvim_not_active,
|
cond = firenvim_not_active,
|
||||||
config = function()
|
config = function()
|
||||||
require("config.statusline")
|
require("config.lualine")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -190,15 +190,7 @@ local plugin_specs = {
|
|||||||
"luukvbaal/statuscol.nvim",
|
"luukvbaal/statuscol.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
config = function()
|
config = function()
|
||||||
local builtin = require("statuscol.builtin")
|
require("config.nvim-statuscol")
|
||||||
require("statuscol").setup {
|
|
||||||
relculright = true,
|
|
||||||
segments = {
|
|
||||||
{ text = { "%s" }, click = "v:lua.ScSa" },
|
|
||||||
{ text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
|
|
||||||
{ text = { builtin.foldfunc, " " }, condition = {true, builtin.not_empty}, click = "v:lua.ScFa" },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -542,6 +534,11 @@ local plugin_specs = {
|
|||||||
require("config.fidget-nvim")
|
require("config.fidget-nvim")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"folke/lazydev.nvim",
|
||||||
|
ft = "lua", -- only load on lua files
|
||||||
|
opts = {},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
require("lazy").setup {
|
require("lazy").setup {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user