From 29d6f51cbcc6fa7bdd0cf4c573b17c0ce294ac32 Mon Sep 17 00:00:00 2001 From: Cool-Game-Dev Date: Tue, 22 Jul 2025 12:23:28 -0500 Subject: [PATCH 1/5] utility/nvim-biscuits: init Add `utility.nvim-biscuits` module. Adds the plugin nvim-biscuits, a rewrite of assorted biscuits. --- configuration.nix | 2 ++ docs/release-notes/rl-0.8.md | 1 + modules/plugins/utility/default.nix | 1 + modules/plugins/utility/nvim-biscuits/config.nix | 14 ++++++++++++++ modules/plugins/utility/nvim-biscuits/default.nix | 6 ++++++ .../utility/nvim-biscuits/nvim-biscuits.nix | 12 ++++++++++++ npins/sources.json | 13 +++++++++++++ 7 files changed, 49 insertions(+) create mode 100644 modules/plugins/utility/nvim-biscuits/config.nix create mode 100644 modules/plugins/utility/nvim-biscuits/default.nix create mode 100644 modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix diff --git a/configuration.nix b/configuration.nix index 62c3e2f1..68776638 100644 --- a/configuration.nix +++ b/configuration.nix @@ -194,6 +194,8 @@ isMaximal: { multicursors.enable = isMaximal; smart-splits.enable = isMaximal; undotree.enable = isMaximal; + nvim-biscuits.enable = isMaximal; + motion = { hop.enable = true; leap.enable = true; diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index c4ad963c..12df89b9 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -38,6 +38,7 @@ [oil.nvim]: https://github.com/stevearc/oil.nvim [hunk.nvim]: https://github.com/julienvincent/hunk.nvim [undotree]: https://github.com/mbbill/undotree +[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits - Add [typst-preview.nvim] under `languages.typst.extensions.typst-preview-nvim`. diff --git a/modules/plugins/utility/default.nix b/modules/plugins/utility/default.nix index 79d7d924..349fb47a 100644 --- a/modules/plugins/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -15,6 +15,7 @@ ./multicursors ./new-file-template ./nix-develop + ./nvim-biscuits ./oil-nvim ./outline ./preview diff --git a/modules/plugins/utility/nvim-biscuits/config.nix b/modules/plugins/utility/nvim-biscuits/config.nix new file mode 100644 index 00000000..8c422149 --- /dev/null +++ b/modules/plugins/utility/nvim-biscuits/config.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkIf; + cfg = config.vim.utility.nvim-biscuits; +in { + config = mkIf cfg.enable { + vim = { + startPlugins = ["nvim-biscuits"]; + }; + }; +} diff --git a/modules/plugins/utility/nvim-biscuits/default.nix b/modules/plugins/utility/nvim-biscuits/default.nix new file mode 100644 index 00000000..07ccecb4 --- /dev/null +++ b/modules/plugins/utility/nvim-biscuits/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./config.nix + ./nvim-biscuits.nix + ]; +} diff --git a/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix b/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix new file mode 100644 index 00000000..538d1510 --- /dev/null +++ b/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix @@ -0,0 +1,12 @@ +{lib, ...}: let + inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkPluginSetupOption; +in { + options.vim.utility.nvim-biscuits = { + enable = mkEnableOption '' + A neovim port of Assorted Biscuits. + ''; + + setupOpts = mkPluginSetupOption "nvim-biscuits" {}; + }; +} diff --git a/npins/sources.json b/npins/sources.json index 3c3bc3c3..92e18e32 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -1708,6 +1708,19 @@ "url": "https://github.com/windwp/nvim-autopairs/archive/4d74e75913832866aa7de35e4202463ddf6efd1b.tar.gz", "hash": "0q6pv89x05l71nfg2chqf9p0d2ha72agmll2svimq0npp84ymfxz" }, + "nvim-biscuits": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "code-biscuits", + "repo": "nvim-biscuits" + }, + "branch": "main", + "submodules": false, + "revision": "ff1d12c8b47cd28723da593b2cfa2e98391d439a", + "url": "https://github.com/code-biscuits/nvim-biscuits/archive/ff1d12c8b47cd28723da593b2cfa2e98391d439a.tar.gz", + "hash": "18dvvg32nxrdp1ydbvxrzkdg7q214naq2bphs7y1s9zmjhyj25pm" + }, "nvim-bufferline-lua": { "type": "Git", "repository": { From 55fc5fecb8a459088cdf65eaec25ad98a7b34bd1 Mon Sep 17 00:00:00 2001 From: Cool-Game-Dev Date: Tue, 22 Jul 2025 19:06:57 -0500 Subject: [PATCH 2/5] fixed release notes Add the plugin under my own name instead of @NotAShelf --- docs/release-notes/rl-0.8.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 12df89b9..f5125f92 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -38,7 +38,6 @@ [oil.nvim]: https://github.com/stevearc/oil.nvim [hunk.nvim]: https://github.com/julienvincent/hunk.nvim [undotree]: https://github.com/mbbill/undotree -[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits - Add [typst-preview.nvim] under `languages.typst.extensions.typst-preview-nvim`. @@ -477,3 +476,7 @@ [soliprem](https://github.com/soliprem): - fix broken `neorg` grammars + +[Cool-Game-Dev](https://github.com/Cool-Game-Dev): + +[nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits From 66e32eeafa5a1aee60349aa30f3f9d2d91c0a4ef Mon Sep 17 00:00:00 2001 From: Cool-Game-Dev Date: Wed, 23 Jul 2025 12:20:14 -0500 Subject: [PATCH 3/5] utility/nvim-biscuits: Add pluginRC Add the setup function for the nvim-biscuits with setupOps to pluginRC. --- modules/plugins/utility/nvim-biscuits/config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/plugins/utility/nvim-biscuits/config.nix b/modules/plugins/utility/nvim-biscuits/config.nix index 8c422149..a0574aa6 100644 --- a/modules/plugins/utility/nvim-biscuits/config.nix +++ b/modules/plugins/utility/nvim-biscuits/config.nix @@ -4,11 +4,17 @@ ... }: let inherit (lib.modules) mkIf; + inherit (lib.nvim.dag) entryAnywhere; + inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.utility.nvim-biscuits; in { config = mkIf cfg.enable { vim = { startPlugins = ["nvim-biscuits"]; + + pluginRC.nvim-biscuits = entryAnywhere '' + require('nvim-biscuits').setup(${toLuaObject cfg.setupOpts}) + ''; }; }; } From b2a462feb72dc08d8699c389a60cc2c14fd6435d Mon Sep 17 00:00:00 2001 From: Cool-Game-Dev Date: Wed, 23 Jul 2025 12:28:29 -0500 Subject: [PATCH 4/5] Add release notes entry Add missing release notes entry, previously only contained a reference to nvim-biscuits github. --- docs/release-notes/rl-0.8.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index f5125f92..0ea9abd4 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -480,3 +480,6 @@ [Cool-Game-Dev](https://github.com/Cool-Game-Dev): [nvim-biscuits]: https://github.com/code-biscuits/nvim-biscuits + +- Add [nvim-biscuits] to show block context. Available at + `vim.utility.nvim-biscuits`. From 0b325d788eebe81d2601c54d8b288ca6245a351d Mon Sep 17 00:00:00 2001 From: Coolio Date: Wed, 23 Jul 2025 15:07:20 -0500 Subject: [PATCH 5/5] utility/nvim-biscuits: improve enable option description Improve the grammar of the `vim.utility.nvim-biscuits.enable` option to read better in documentation. Co-authored-by: raf --- modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix b/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix index 538d1510..3db7acea 100644 --- a/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix +++ b/modules/plugins/utility/nvim-biscuits/nvim-biscuits.nix @@ -3,9 +3,7 @@ inherit (lib.nvim.types) mkPluginSetupOption; in { options.vim.utility.nvim-biscuits = { - enable = mkEnableOption '' - A neovim port of Assorted Biscuits. - ''; + enable = mkEnableOption "a Neovim port of Assorted Biscuits [nvim-biscuits]"; setupOpts = mkPluginSetupOption "nvim-biscuits" {}; };