From 3dc952d69cd38cdc3ad3ec7570fc4a1caed2bfea Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 24 Nov 2025 10:58:52 +0000
Subject: [PATCH] flake: simplify `legacyPackages` definitions

- Remove the `makeNixvimWithModule` module arg.
- Move standalone wrapper definitions to `wrappers.nix`
- Move `nixvimConfiguration` alias to `nixvim-configurations.nix`
---
 flake/default.nix               |  1 -
 flake/legacy-packages.nix       | 15 ---------------
 flake/nixvim-configurations.nix |  4 +++-
 flake/wrappers.nix              |  8 ++++++--
 4 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 flake/legacy-packages.nix

diff --git a/flake/default.nix b/flake/default.nix
index 028e0e62..1df0e406 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -10,7 +10,6 @@
     ./flake-modules
     ./ci.nix
     ./lib.nix
-    ./legacy-packages.nix
     ./nixvim-configurations.nix
     ./overlays.nix
     ./packages.nix
diff --git a/flake/legacy-packages.nix b/flake/legacy-packages.nix
deleted file mode 100644
index ac83fd99..00000000
--- a/flake/legacy-packages.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  perSystem =
-    {
-      config,
-      makeNixvimWithModule,
-      ...
-    }:
-    {
-      legacyPackages = rec {
-        inherit makeNixvimWithModule;
-        makeNixvim = module: makeNixvimWithModule { inherit module; };
-        nixvimConfiguration = config.nixvimConfigurations.default;
-      };
-    };
-}
diff --git a/flake/nixvim-configurations.nix b/flake/nixvim-configurations.nix
index e538678a..0223509d 100644
--- a/flake/nixvim-configurations.nix
+++ b/flake/nixvim-configurations.nix
@@ -1,10 +1,12 @@
 { self, ... }:
 {
   perSystem =
-    { system, ... }:
+    { config, system, ... }:
     {
       nixvimConfigurations.default = self.lib.evalNixvim {
         inherit system;
       };
+
+      legacyPackages.nixvimConfiguration = config.nixvimConfigurations.default;
     };
 }
diff --git a/flake/wrappers.nix b/flake/wrappers.nix
index 1eb77645..2fda9682 100644
--- a/flake/wrappers.nix
+++ b/flake/wrappers.nix
@@ -8,13 +8,17 @@ let
 in
 {
   perSystem =
-    { system, ... }:
+    { config, system, ... }:
+    let
+      inherit (config.legacyPackages) makeNixvimWithModule;
+    in
     {
-      _module.args = {
+      legacyPackages = {
         makeNixvimWithModule = import ../wrappers/standalone.nix {
           inherit lib self;
           defaultSystem = system;
         };
+        makeNixvim = module: makeNixvimWithModule { inherit module; };
       };
     };