Merge remote-tracking branch 'upstream/main' into luasnip-setupOpts

This commit is contained in:
LilleAila 2025-01-12 11:40:57 +01:00
commit 607373645f
No known key found for this signature in database
GPG key ID: D1ACCDCF2B9B9799
2 changed files with 13 additions and 0 deletions

View file

@ -52,3 +52,4 @@
- Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
issue with setting the workspace directory. issue with setting the workspace directory.
- Add `vim.snippets.luasnip.setupOpts`, which was previously missing. - Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
- Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.

View file

@ -46,6 +46,18 @@
) )
''; '';
}; };
prettierd = {
package = pkgs.prettierd;
nullConfig = ''
table.insert(
ls_sources,
null_ls.builtins.formatting.prettierd.with({
filetypes = ${expToLua (concatLists [cfg.format.extraFiletypes ["markdown"]])},
command = "${cfg.format.package}/bin/prettierd",
})
)
'';
};
}; };
in { in {
options.vim.languages.markdown = { options.vim.languages.markdown = {