fix(modules/nvim/plgs/lf-nvim): Use the package from my nixpgks pr

5 files changed, 19 insertions, 4 deletions

diff --git a/flake.nix b/flake.nix
index f4a31806..c9586fb8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
 
     # open nixpkgs prs
     # FIXME: Close these PRs <2024-09-07>
+    nixpkgs-lf.url = "github:bpeetz/nixpkgs/init-lf.nvim";
 
     library = {
       url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
@@ -262,6 +263,7 @@
     self,
     nixpkgs,
     nixpkgs-stable,
+    nixpkgs-lf,
     library,
     # modules
     home-manager,
@@ -300,6 +302,7 @@
     nixpkgs_as_input = nixpkgs;
     nixpkgs_open_prs = {
       inherit
+        nixpkgs-lf
         ;
     };
 
diff --git a/flake/default.nix b/flake/default.nix
index 90997aa3..39e7d02e 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -66,7 +66,7 @@
   };
 
   tests = import ../tests {
-    inherit pkgs nixpkgs_as_input myPkgs sysLib nixLib;
+    inherit pkgs nixpkgs_as_input myPkgs sysLib nixLib nixpkgs_open_prs system;
     inherit (pkgs) lib;
     extraModules = {
       nixvim = {
diff --git a/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix b/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix
index 5e2836b0..1e7c91e3 100644
--- a/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix
+++ b/modules/by-name/nv/nvim/plgs/lf-nvim/default.nix
@@ -2,6 +2,8 @@
   pkgs,
   lib,
   config,
+  nixpkgs_open_prs,
+  system,
   ...
 }: let
   cfg = config.soispha.programs.nvim;
@@ -13,7 +15,7 @@ in {
       ${lib.strings.fileContents ./lua/lf-nvim.lua}
     '';
     extraPlugins = [
-      pkgs.vimExtraPlugins.lf-nvim
+      nixpkgs_open_prs.nixpkgs-lf.legacyPackages."${system}".vimPlugins.lf-nvim
 
       pkgs.vimPlugins.toggleterm-nvim # required by lf-nvim
     ];
diff --git a/tests/default.nix b/tests/default.nix
index c36a5906..af004feb 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -6,6 +6,8 @@
   nixpkgs_as_input,
   sysLib,
   extraModules,
+  nixpkgs_open_prs,
+  system,
 }: let
   mkTest = import ./infrastructure {
     inherit
@@ -15,6 +17,8 @@
       myPkgs
       extraModules
       sysLib
+      nixpkgs_open_prs
+      system
       ;
   };
 
diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix
index e0ad6889..9e6ab08c 100644
--- a/tests/infrastructure/default.nix
+++ b/tests/infrastructure/default.nix
@@ -5,7 +5,8 @@
   nixos-lib,
   extraModules,
   sysLib,
-  ...
+  nixpkgs_open_prs,
+  system,
 }: {
   name,
   configuration,
@@ -22,7 +23,12 @@ nixos-lib.runTest {
 
   node = {
     specialArgs = {
-      inherit myPkgs sysLib;
+      inherit
+        myPkgs
+        sysLib
+        nixpkgs_open_prs
+        system
+        ;
     };
     # Use the nixpkgs as constructed by the `nixpkgs.*` options
     pkgs = null;