From 7d17c1b71db8a8ba9dfaea41c9768ac63bceb060 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 24 Nov 2025 07:41:20 +0000
Subject: [PATCH] flake: remove `helpers` module arg

Not to be confused with the Nixvim-configuration `helpers` module arg,
remove the flake-parts `helpers` module arg.
---
 docs/default.nix                | 3 +--
 flake/dev/tests.nix             | 8 ++------
 flake/lib.nix                   | 5 -----
 flake/nixvim-configurations.nix | 4 ++--
 flake/packages.nix              | 8 +-------
 tests/default.nix               | 2 +-
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/docs/default.nix b/docs/default.nix
index 1e8bd6d2..b72c46de 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -1,5 +1,4 @@
 {
-  helpers,
   system,
   nixvim,
   nixpkgs,
@@ -84,7 +83,7 @@ let
       ) opt.declarations;
     };
 
-  configuration = helpers.modules.evalNixvim {
+  configuration = nixvim.lib.evalNixvim {
     modules = [
       {
         isDocs = true;
diff --git a/flake/dev/tests.nix b/flake/dev/tests.nix
index 66a9b8da..95476562 100644
--- a/flake/dev/tests.nix
+++ b/flake/dev/tests.nix
@@ -1,14 +1,10 @@
-{
-  self,
-  helpers,
-  ...
-}:
+{ self, ... }:
 {
   perSystem =
     { pkgs, ... }:
     let
       tests = pkgs.callPackage ../../tests {
-        inherit helpers self;
+        inherit self;
       };
     in
     {
diff --git a/flake/lib.nix b/flake/lib.nix
index 34067250..06fdc323 100644
--- a/flake/lib.nix
+++ b/flake/lib.nix
@@ -6,11 +6,6 @@
   ...
 }:
 {
-  # Expose lib as a flake-parts module arg
-  _module.args = {
-    helpers = self.lib.nixvim;
-  };
-
   # Public `lib` flake output
   flake.lib = {
     nixvim = lib.makeOverridable ({ lib }: (lib.extend self.lib.overlay).nixvim) {
diff --git a/flake/nixvim-configurations.nix b/flake/nixvim-configurations.nix
index b7f45eb6..e538678a 100644
--- a/flake/nixvim-configurations.nix
+++ b/flake/nixvim-configurations.nix
@@ -1,9 +1,9 @@
-{ helpers, ... }:
+{ self, ... }:
 {
   perSystem =
     { system, ... }:
     {
-      nixvimConfigurations.default = helpers.modules.evalNixvim {
+      nixvimConfigurations.default = self.lib.evalNixvim {
         inherit system;
       };
     };
diff --git a/flake/packages.nix b/flake/packages.nix
index f5e310ce..613289e6 100644
--- a/flake/packages.nix
+++ b/flake/packages.nix
@@ -1,9 +1,4 @@
-{
-  self,
-  inputs,
-  helpers,
-  ...
-}:
+{ self, inputs, ... }:
 {
   perSystem =
     {
@@ -18,7 +13,6 @@
 
       packages = import ../docs {
         nixvim = self;
-        inherit helpers;
         inherit system;
         inherit (inputs) nixpkgs;
         inherit (inputs') nuschtosSearch;
diff --git a/tests/default.nix b/tests/default.nix
index 2f571b24..2be680d2 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,12 +1,12 @@
 {
   pkgs,
-  helpers,
   lib,
   linkFarm,
   self, # The flake instance
 }:
 let
   inherit (pkgs.stdenv.hostPlatform) system;
+  helpers = self.lib.nixvim;
 
   # Use a single common instance of nixpkgs, with allowUnfree
   # Having a single shared instance should speed up tests a little