From fecc8921459578c32eb371341c2c14e3c70424ba Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 19 Jan 2025 12:55:15 +0000
Subject: [PATCH] flake: remove `pkgsUnfree` arg

---
 flake/default.nix | 12 ------------
 flake/tests.nix   | 12 ++----------
 tests/default.nix |  2 --
 tests/main.nix    | 11 ++++++-----
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/flake/default.nix b/flake/default.nix
index 69df8a41..72b1e5a2 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -1,4 +1,3 @@
-{ inputs, ... }:
 {
   imports = [
     ./dev
@@ -10,15 +9,4 @@
     ./tests.nix
     ./wrappers.nix
   ];
-
-  perSystem =
-    { system, ... }:
-    {
-      _module.args = {
-        pkgsUnfree = import inputs.nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      };
-    };
 }
diff --git a/flake/tests.nix b/flake/tests.nix
index 9ed0ea4b..1cadf55d 100644
--- a/flake/tests.nix
+++ b/flake/tests.nix
@@ -5,18 +5,10 @@
 }:
 {
   perSystem =
-    {
-      pkgs,
-      pkgsUnfree,
-      ...
-    }:
+    { pkgs, ... }:
     {
       checks = pkgs.callPackages ../tests {
-        inherit
-          helpers
-          pkgsUnfree
-          self
-          ;
+        inherit helpers self;
       };
     };
 }
diff --git a/tests/default.nix b/tests/default.nix
index 471f169d..4a5ccd31 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  pkgsUnfree,
   helpers,
   lib,
   linkFarm,
@@ -11,7 +10,6 @@ let
   autoArgs = pkgs // {
     inherit
       helpers
-      pkgsUnfree
       self
       system
       ;
diff --git a/tests/main.nix b/tests/main.nix
index 3801e0cb..5313d839 100644
--- a/tests/main.nix
+++ b/tests/main.nix
@@ -6,7 +6,6 @@
   lib ? pkgs.lib,
   linkFarm,
   pkgs,
-  pkgsUnfree,
   self,
   system,
 }:
@@ -21,14 +20,16 @@ let
     file: name: module:
     mkTestDerivationFromNixvimModule {
       inherit name;
-      # Use a single common instance of nixpkgs, with allowUnfree
-      # Having a single shared instance should speed up tests a little
       module = {
         _file = file;
         imports = [ module ];
-        nixpkgs.pkgs = pkgsUnfree;
       };
-      pkgs = pkgsUnfree;
+      # Use a single common instance of nixpkgs, with allowUnfree
+      # Having a single shared instance should speed up tests a little
+      pkgs = import self.inputs.nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
     };
 
   # List of files containing configurations