seliaste/nvim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated plugins

Browse source
This commit is contained in:
Tony Thayer-Osborne 2025-04-11 13:45:28 -07:00
parent d479a79344
commit 9844d31b4b
No known key found for this signature in database
GPG key ID: 4750FF483E701B75
4 changed files with 114 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

114
lua/custom/plugins/nvim-ufa.lua
View file

@ -1,8 +1,8 @@
return {
"kevinhwang91/nvim-ufo",
dependencies = "kevinhwang91/promise-async",
event = "VimEnter", -- needed for folds to load in time and comments closed
keys = {
'kevinhwang91/nvim-ufo',
dependencies = 'kevinhwang91/promise-async',
event = 'VimEnter', -- needed for folds to load in time and comments closed
keys = {
-- stylua: ignore start
{ "zm", function() require("ufo").closeAllFolds() end, desc = "󱃄 Close All Folds" },
{ "zr", function() require("ufo").openFoldsExceptKinds { "comment", "imports" } end, desc = "󱃄 Open All Regular Folds" },
@ -11,58 +11,60 @@ return {
{ "z2", function() require("ufo").closeFoldsWith(2) end, desc = "󱃄 Close L2 Folds" },
{ "z3", function() require("ufo").closeFoldsWith(3) end, desc = "󱃄 Close L3 Folds" },
{ "z4", function() require("ufo").closeFoldsWith(4) end, desc = "󱃄 Close L4 Folds" },
-- stylua: ignore end
},
init = function()
-- INFO fold commands usually change the foldlevel, which fixes folds, e.g.
-- auto-closing them after leaving insert mode, however ufo does not seem to
-- have equivalents for zr and zm because there is no saved fold level.
-- Consequently, the vim-internal fold levels need to be disabled by setting
-- them to 99
vim.opt.foldlevel = 99
vim.opt.foldlevelstart = 99
-- stylua: ignore end
},
init = function()
-- INFO fold commands usually change the foldlevel, which fixes folds, e.g.
-- auto-closing them after leaving insert mode, however ufo does not seem to
-- have equivalents for zr and zm because there is no saved fold level.
-- Consequently, the vim-internal fold levels need to be disabled by setting
-- them to 99
vim.opt.foldlevel = 99
vim.opt.foldlevelstart = 99
end,
opts = {
provider_selector = function(_, ft, _)
-- INFO some filetypes only allow indent, some only LSP, some only
-- treesitter. However, ufo only accepts two kinds as priority,
-- therefore making this function necessary :/
local lspWithOutFolding = { 'markdown', 'sh', 'css', 'html', 'python' }
if vim.tbl_contains(lspWithOutFolding, ft) then
return { 'treesitter', 'indent' }
end
return { 'lsp', 'indent' }
end,
opts = {
provider_selector = function(_, ft, _)
-- INFO some filetypes only allow indent, some only LSP, some only
-- treesitter. However, ufo only accepts two kinds as priority,
-- therefore making this function necessary :/
local lspWithOutFolding = { "markdown", "sh", "css", "html", "python" }
if vim.tbl_contains(lspWithOutFolding, ft) then return { "treesitter", "indent" } end
return { "lsp", "indent" }
end,
-- when opening the buffer, close these fold kinds
-- use `:UfoInspect` to get available fold kinds from the LSP
close_fold_kinds_for_ft = {
default = { "imports", "comment" },
},
open_fold_hl_timeout = 800,
fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
local hlgroup = "NonText"
local newVirtText = {}
local suffix = "" .. tostring(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)
if curWidth + chunkWidth < targetWidth then
suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
end
break
end
curWidth = curWidth + chunkWidth
end
table.insert(newVirtText, { suffix, hlgroup })
return newVirtText
end,
-- when opening the buffer, close these fold kinds
-- use `:UfoInspect` to get available fold kinds from the LSP
close_fold_kinds_for_ft = {
default = { 'imports', 'comment' },
},
open_fold_hl_timeout = 800,
fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
local hlgroup = 'NonText'
local newVirtText = {}
local suffix = '' .. tostring(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)
if curWidth + chunkWidth < targetWidth then
suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
end
break
end
curWidth = curWidth + chunkWidth
end
table.insert(newVirtText, { suffix, hlgroup })
return newVirtText
end,
},
}

19
lua/custom/plugins/orgmode.lua Normal file
View file

@ -0,0 +1,19 @@
return {
'nvim-orgmode/orgmode',
event = 'VeryLazy',
ft = { 'org' },
config = function()
-- Setup orgmode
require('orgmode').setup {
org_agenda_files = '~/orgfiles/**/*',
org_default_notes_file = '~/orgfiles/refile.org',
}
-- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
-- add ~org~ to ignore_install
-- require('nvim-treesitter.configs').setup({
-- ensure_installed = 'all',
-- ignore_install = { 'org' },
-- })
end,
}