From 5b55858fe3e59cf3d6587202dfd4d48ca99aa457 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 24 Sep 2024 10:19:12 +0100
Subject: [PATCH] wrappers: use `(evalModules {}).type` for nixvim submodule

---
 wrappers/darwin.nix     | 22 +++++++++++-----------
 wrappers/hm.nix         | 22 +++++++++++-----------
 wrappers/nixos.nix      | 22 +++++++++++-----------
 wrappers/standalone.nix |  6 +++---
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix
index 40ae8062..6c8adca3 100644
--- a/wrappers/darwin.nix
+++ b/wrappers/darwin.nix
@@ -16,22 +16,22 @@ let
     types
     ;
   cfg = config.programs.nixvim;
+  nixvimConfig = config.lib.nixvim.modules.evalNixvim {
+    extraSpecialArgs = {
+      defaultPkgs = pkgs;
+      darwinConfig = config;
+    };
+    modules = [
+      ./modules/darwin.nix
+    ];
+    check = false;
+  };
 in
 {
   options = {
     programs.nixvim = mkOption {
+      inherit (nixvimConfig) type;
       default = { };
-      type = types.submoduleWith {
-        shorthandOnlyDefinesConfig = true;
-        specialArgs = config.lib.nixvim.modules.specialArgsWith {
-          defaultPkgs = pkgs;
-          darwinConfig = config;
-        };
-        modules = [
-          ./modules/darwin.nix
-          ../modules/top-level
-        ];
-      };
     };
   };
 
diff --git a/wrappers/hm.nix b/wrappers/hm.nix
index ec7701d9..96a017e5 100644
--- a/wrappers/hm.nix
+++ b/wrappers/hm.nix
@@ -15,22 +15,22 @@ let
     types
     ;
   cfg = config.programs.nixvim;
+  nixvimConfig = config.lib.nixvim.modules.evalNixvim {
+    extraSpecialArgs = {
+      defaultPkgs = pkgs;
+      hmConfig = config;
+    };
+    modules = [
+      ./modules/hm.nix
+    ];
+    check = false;
+  };
 in
 {
   options = {
     programs.nixvim = mkOption {
+      inherit (nixvimConfig) type;
       default = { };
-      type = types.submoduleWith {
-        shorthandOnlyDefinesConfig = true;
-        specialArgs = config.lib.nixvim.modules.specialArgsWith {
-          defaultPkgs = pkgs;
-          hmConfig = config;
-        };
-        modules = [
-          ./modules/hm.nix
-          ../modules/top-level
-        ];
-      };
     };
   };
 
diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix
index 7033c3d1..60a68bf3 100644
--- a/wrappers/nixos.nix
+++ b/wrappers/nixos.nix
@@ -16,22 +16,22 @@ let
     types
     ;
   cfg = config.programs.nixvim;
+  nixvimConfig = config.lib.nixvim.modules.evalNixvim {
+    extraSpecialArgs = {
+      defaultPkgs = pkgs;
+      nixosConfig = config;
+    };
+    modules = [
+      ./modules/nixos.nix
+    ];
+    check = false;
+  };
 in
 {
   options = {
     programs.nixvim = mkOption {
+      inherit (nixvimConfig) type;
       default = { };
-      type = types.submoduleWith {
-        shorthandOnlyDefinesConfig = true;
-        specialArgs = config.lib.nixvim.modules.specialArgsWith {
-          defaultPkgs = pkgs;
-          nixosConfig = config;
-        };
-        modules = [
-          ./modules/nixos.nix
-          ../modules/top-level
-        ];
-      };
     };
   };
 
diff --git a/wrappers/standalone.nix b/wrappers/standalone.nix
index efb3cdf8..433a86b8 100644
--- a/wrappers/standalone.nix
+++ b/wrappers/standalone.nix
@@ -15,7 +15,7 @@ let
   mkNvim =
     mod:
     let
-      evaledModule = evalNixvim {
+      nixvimConfig = evalNixvim {
         modules = [
           mod
           ./modules/standalone.nix
@@ -24,7 +24,7 @@ let
           defaultPkgs = pkgs;
         } // extraSpecialArgs;
       };
-      inherit (evaledModule.config) enableMan finalPackage printInitPackage;
+      inherit (nixvimConfig.config) enableMan finalPackage printInitPackage;
     in
     (pkgs.symlinkJoin {
       name = "nixvim";
@@ -35,7 +35,7 @@ let
       meta.mainProgram = "nvim";
     })
     // rec {
-      inherit (evaledModule) config options;
+      inherit (nixvimConfig) config options;
       extend =
         extension:
         mkNvim {