From 3d969603481c745f8faa411f1e8b7c97517c67a3 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 2 Jul 2024 15:06:39 +0100
Subject: [PATCH] wrappers: simplify modules

---
 wrappers/darwin.nix         |  7 +------
 wrappers/hm.nix             |  2 +-
 wrappers/modules/darwin.nix |  8 ++++++++
 wrappers/modules/enable.nix |  4 ++++
 wrappers/modules/hm.nix     |  5 +++--
 wrappers/modules/nixos.nix  | 12 ++++++++++++
 wrappers/nixos.nix          | 10 +---------
 7 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 wrappers/modules/darwin.nix
 create mode 100644 wrappers/modules/enable.nix
 create mode 100644 wrappers/modules/nixos.nix

diff --git a/wrappers/darwin.nix b/wrappers/darwin.nix
index 2891c0f1..ce2d9a28 100644
--- a/wrappers/darwin.nix
+++ b/wrappers/darwin.nix
@@ -33,12 +33,7 @@ in
           darwinConfig = config;
           inherit helpers;
         };
-        modules = [
-          {
-            options.enable = mkEnableOption "nixvim";
-            config.wrapRc = mkForce true;
-          }
-        ] ++ shared.topLevelModules;
+        modules = [ ./modules/darwin.nix ] ++ shared.topLevelModules;
       };
     };
     nixvim.helpers = shared.helpers;
diff --git a/wrappers/hm.nix b/wrappers/hm.nix
index fbcf7e55..c113d5c0 100644
--- a/wrappers/hm.nix
+++ b/wrappers/hm.nix
@@ -35,7 +35,7 @@ in
           hmConfig = config;
           inherit helpers;
         };
-        modules = [ (import ./modules/hm.nix { inherit lib; }) ] ++ shared.topLevelModules;
+        modules = [ ./modules/hm.nix ] ++ shared.topLevelModules;
       };
     };
     nixvim.helpers = shared.helpers;
diff --git a/wrappers/modules/darwin.nix b/wrappers/modules/darwin.nix
new file mode 100644
index 00000000..4ca13061
--- /dev/null
+++ b/wrappers/modules/darwin.nix
@@ -0,0 +1,8 @@
+{ lib, ... }:
+{
+  imports = [ ./enable.nix ];
+
+  config = {
+    wrapRc = lib.mkForce true;
+  };
+}
diff --git a/wrappers/modules/enable.nix b/wrappers/modules/enable.nix
new file mode 100644
index 00000000..e9ac581e
--- /dev/null
+++ b/wrappers/modules/enable.nix
@@ -0,0 +1,4 @@
+{ lib, ... }:
+{
+  options.enable = lib.mkEnableOption "nixvim";
+}
diff --git a/wrappers/modules/hm.nix b/wrappers/modules/hm.nix
index 3f37c2f8..55059afa 100644
--- a/wrappers/modules/hm.nix
+++ b/wrappers/modules/hm.nix
@@ -1,8 +1,7 @@
-{ lib }:
+{ lib, ... }:
 with lib;
 {
   options = {
-    enable = mkEnableOption "nixvim";
     defaultEditor = mkEnableOption "nixvim as the default editor";
 
     vimdiffAlias = mkOption {
@@ -13,4 +12,6 @@ with lib;
       '';
     };
   };
+
+  imports = [ ./enable.nix ];
 }
diff --git a/wrappers/modules/nixos.nix b/wrappers/modules/nixos.nix
new file mode 100644
index 00000000..b65e5d73
--- /dev/null
+++ b/wrappers/modules/nixos.nix
@@ -0,0 +1,12 @@
+{ lib, ... }:
+{
+  options = {
+    defaultEditor = lib.mkEnableOption "nixvim as the default editor";
+  };
+
+  imports = [ ./enable.nix ];
+
+  config = {
+    wrapRc = lib.mkForce true;
+  };
+}
diff --git a/wrappers/nixos.nix b/wrappers/nixos.nix
index bc35c685..6afe6408 100644
--- a/wrappers/nixos.nix
+++ b/wrappers/nixos.nix
@@ -36,15 +36,7 @@ in
           nixosConfig = config;
           inherit helpers;
         };
-        modules = [
-          {
-            options = {
-              enable = mkEnableOption "nixvim";
-              defaultEditor = mkEnableOption "nixvim as the default editor";
-            };
-            config.wrapRc = mkForce true;
-          }
-        ] ++ shared.topLevelModules;
+        modules = [ ./modules/nixos.nix ] ++ shared.topLevelModules;
       };
     };
     nixvim.helpers = shared.helpers;