From 78efcd173c060163d1737139feea5bb793a7fdbf Mon Sep 17 00:00:00 2001 From: Gerg-L <88247690+Gerg-L@users.noreply.github.com> Date: Mon, 14 Apr 2025 04:06:24 +0000 Subject: [PATCH 1/4] flake: bump inputs (#831) --- flake.lock | 6 +++--- npins/sources.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e31038ab..540715e9 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ }, "mnw": { "locked": { - "lastModified": 1744497692, - "narHash": "sha256-ikWRNR/P/aKCCySZnUfF1W0u0t6rSoJgQgKeDdCBAK8=", + "lastModified": 1744592022, + "narHash": "sha256-QuWrCRiF3CUM99sgj3gXbIzB1IAVWS5IEfFHadbMA2g=", "owner": "Gerg-L", "repo": "mnw", - "rev": "c5322a2bf74c0066fd15ca35721561397a2e7eab", + "rev": "cf9e19413b6c2d995b55565cd99facf9c751b653", "type": "github" }, "original": { diff --git a/npins/sources.nix b/npins/sources.nix index 162f1d94..3ae0b99e 100644 --- a/npins/sources.nix +++ b/npins/sources.nix @@ -98,7 +98,9 @@ builtins.mapAttrs Channel = getZip; Tarball = getUrl; } - .${spec.type} + .${ + spec.type + } or (builtins.throw "Unknown source type ${spec.type}"); in spec // {outPath = mayOverride (func spec);} From 920f3c9670b1b9a62e7911cd17720d394648858c Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 14 Apr 2025 07:07:39 +0300 Subject: [PATCH 2/4] ci: exclude npins directory in formatting check --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a349cb07..a3f4fce3 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -37,7 +37,7 @@ jobs: uses: DeterminateSystems/nix-installer-action@main - name: Check formatting via Alejandra - run: nix run nixpkgs#alejandra -- -c . + run: nix run nixpkgs#alejandra -- --check . --exclude npins check-typos: name: "Check source tree for typos" From f516cb43ceb2b071e6b9a6d5c9d681c8a3187f5f Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 14 Apr 2025 17:02:34 +0300 Subject: [PATCH 3/4] git/gitlinker-nvim: remove duplicate package entry --- modules/plugins/git/gitlinker-nvim/config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/plugins/git/gitlinker-nvim/config.nix b/modules/plugins/git/gitlinker-nvim/config.nix index d1104a28..749cf18c 100644 --- a/modules/plugins/git/gitlinker-nvim/config.nix +++ b/modules/plugins/git/gitlinker-nvim/config.nix @@ -9,7 +9,6 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = ["gitlinker-nvim"]; lazy.plugins = { "gitlinker-nvim" = { package = "gitlinker-nvim"; From 11426ea329344925a7ff76b64cbb012ed3ec3ebc Mon Sep 17 00:00:00 2001 From: Noah765 Date: Thu, 17 Apr 2025 09:09:29 +0200 Subject: [PATCH 4/4] languages/dart: add flutter-tools.nvim dependency plenary.nvim --- docs/release-notes/rl-0.8.md | 4 ++++ modules/plugins/languages/dart.nix | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 710578eb..642599ba 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -328,3 +328,7 @@ [rrvsh](https://github.com/rrvsh): - Fix namespace of python-lsp-server by changing it to python3Packages + +[Noah765](https://github.com/Noah765): + +- Add missing `flutter-tools.nvim` dependency `plenary.nvim`. diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix index 4f8a7028..77d92d3b 100644 --- a/modules/plugins/languages/dart.nix +++ b/modules/plugins/languages/dart.nix @@ -134,10 +134,14 @@ in { }) (mkIf ftcfg.enable { - vim.startPlugins = - if ftcfg.enableNoResolvePatch - then ["flutter-tools-patched"] - else ["flutter-tools-nvim"]; + vim.startPlugins = [ + ( + if ftcfg.enableNoResolvePatch + then "flutter-tools-patched" + else "flutter-tools-nvim" + ) + "plenary-nvim" + ]; vim.pluginRC.flutter-tools = entryAnywhere '' require('flutter-tools').setup {