Merge remote-tracking branch 'origin/calendar-support' into feature-gap
CI / cargo fmt --check (push) Successful in 35s
CI / cargo clippy (push) Successful in 32s
CI / cargo test (push) Successful in 39s
CI / editor keymaps (push) Successful in 1m32s

# Conflicts:
#	development/vimwiki-gap.md
This commit is contained in:
2026-06-03 01:46:07 +00:00
18 changed files with 682 additions and 45 deletions
+6
View File
@@ -76,6 +76,12 @@ M.defaults = {
diagnostic = {
link_severity = 'warn',
},
-- Calendar-vim integration. On by default — set to `false` to opt out.
-- When on, nuwiki detects calendar-vim on the runtimepath and wires
-- `g:calendar_action` / `g:calendar_sign` automatically.
-- Also respects `g:nuwiki_no_calendar` set before setup() to disable.
use_calendar = true,
}
M.options = vim.deepcopy(M.defaults)
+7
View File
@@ -106,6 +106,13 @@ function M.setup(opts)
vim.filetype.add({ extension = extensions })
end
-- Calendar-vim wiring lives in plugin/nuwiki.vim's FileType autocmd, which
-- runs for both Vim and Neovim. Translate the Lua-side opt-out into the
-- g: flag that autocmd reads so `use_calendar = false` fully disables it.
if config.options.use_calendar == false then
vim.g.nuwiki_no_calendar = 1
end
lsp.register()
_setup_global_mappings()
_setup_global_commands()