From 6e98b894b73e77067ebc607baef3913441609396 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sat, 11 Jan 2025 12:48:41 +0100 Subject: [PATCH 1/5] languages/markdown: add prettierd formatter --- modules/plugins/languages/markdown.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix index ab184835..ac098a1c 100644 --- a/modules/plugins/languages/markdown.nix +++ b/modules/plugins/languages/markdown.nix @@ -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 { options.vim.languages.markdown = { From 983a81c96c1a30119b01977163270273e8c1395f Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sat, 11 Jan 2025 15:32:35 +0100 Subject: [PATCH 2/5] languages/markdown: add prettierd to changelog --- docs/release-notes/rl-0.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index c65defeb..62e83a0e 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -51,3 +51,4 @@ - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes issue with setting the workspace directory. +- Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`. From 9818d199378ff70c7bf77d0988e9da05fc27f1a4 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sun, 12 Jan 2025 09:58:55 +0100 Subject: [PATCH 3/5] snippets/luasnip: revert adding lazy event --- docs/release-notes/rl-0.8.md | 1 - modules/plugins/snippets/luasnip/config.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index f79eb940..3c07aa09 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -52,4 +52,3 @@ - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes issue with setting the workspace directory. - Add `vim.snippets.luasnip.setupOpts`, which was previously missing. -- Add a trigger event for luasnip lazy-loading diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix index 60a5ca6d..0f887e5f 100644 --- a/modules/plugins/snippets/luasnip/config.nix +++ b/modules/plugins/snippets/luasnip/config.nix @@ -11,7 +11,7 @@ in { vim = { lazy.plugins.luasnip = { package = "luasnip"; - event = "BufEnter"; + lazy = true; after = cfg.loaders; setupModule = "luasnip"; inherit (cfg) setupOpts; From c59f8922b298d471b561a49573f739dd9529b1f6 Mon Sep 17 00:00:00 2001 From: LilleAila <67327023+LilleAila@users.noreply.github.com> Date: Sun, 12 Jan 2025 11:39:41 +0100 Subject: [PATCH 4/5] snippets/luasnip: add whitespace, organize options Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com> --- modules/plugins/snippets/luasnip/config.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix index 0f887e5f..a3767aa7 100644 --- a/modules/plugins/snippets/luasnip/config.nix +++ b/modules/plugins/snippets/luasnip/config.nix @@ -11,10 +11,13 @@ in { vim = { lazy.plugins.luasnip = { package = "luasnip"; + lazy = true; - after = cfg.loaders; + setupModule = "luasnip"; inherit (cfg) setupOpts; + + after = cfg.loaders; }; startPlugins = cfg.providers; autocomplete.nvim-cmp = { From fedbee3a30e9b0043b77bb1c705dd83c0860dbc6 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Sun, 12 Jan 2025 12:48:44 +0100 Subject: [PATCH 5/5] snippets/luasnip: fix formatting --- modules/plugins/snippets/luasnip/config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix index a3767aa7..b05f9f27 100644 --- a/modules/plugins/snippets/luasnip/config.nix +++ b/modules/plugins/snippets/luasnip/config.nix @@ -11,12 +11,12 @@ in { vim = { lazy.plugins.luasnip = { package = "luasnip"; - + lazy = true; - + setupModule = "luasnip"; inherit (cfg) setupOpts; - + after = cfg.loaders; }; startPlugins = cfg.providers;