modules/top-level: move out of wrappers/modules

docs/default.nix

@@ -63,9 +63,11 @@ let
     # Evaluation is irrelevant, only used for documentation.
   };
 
+  # Construct our own top-level modules, because we want to stub the `files` option
+  # FIXME: add a way to handle this with specialArgs
   topLevelModules = [
     ../modules
-    ../wrappers/modules/output.nix
+    ../modules/top-level/output.nix
     # Fake module to avoid a duplicated documentation
     (lib.setDefaultModuleLocation "${nixvimPath}/wrappers/modules/files.nix" {
       options.files = lib.mkOption {

modules/default.nix

@@ -1,3 +1,7 @@
+# This module includes the nixvim modules that should always be evaluated.
+#
+# You may want to use the `/modules/top-level` module instead, unless you're
+# using this in a submodule nested within another nixvim config.
 {
   imports = [
     ./misc

modules/top-level/default.nix

@@ -0,0 +1,12 @@
+# Alternative to `/modules` that also includes modules that should only exist at the "top-level".
+# Therefore, `/modules` should be used instead for submodules nested within a nixvim config.
+#
+# When using this, you likely also want a "wrapper" module for any platform-specific options.
+# See `/wrappers/modules` for examples.
+{
+  imports = [
+    ../.
+    ./files.nix
+    ./output.nix
+  ];
+}

modules/top-level/files.nix

@@ -17,7 +17,7 @@ let
       (
         { name, config, ... }:
         {
-          imports = [ ../../modules ];
+          imports = [ ../. ];
           options.plugin = lib.mkOption {
             type = types.package;
             description = "A derivation with the content of the file in it";

wrappers/_shared.nix

@@ -5,12 +5,6 @@ let
   cfg = config.programs.nixvim;
 in
 {
-  topLevelModules = [
-    ../modules
-    ./modules/output.nix
-    ./modules/files.nix
-  ];
-
   helpers = mkOption {
     type = mkOptionType {
       name = "helpers";

wrappers/darwin.nix

@@ -30,7 +30,10 @@ in
           defaultPkgs = pkgs;
           inherit helpers;
         };
-        modules = [ ./modules/darwin.nix ] ++ shared.topLevelModules;
+        modules = [
+          ./modules/darwin.nix
+          ../modules/top-level
+        ];
       };
     };
     nixvim.helpers = shared.helpers;

wrappers/hm.nix

@@ -32,7 +32,10 @@ in
           defaultPkgs = pkgs;
           inherit helpers;
         };
-        modules = [ ./modules/hm.nix ] ++ shared.topLevelModules;
+        modules = [
+          ./modules/hm.nix
+          ../modules/top-level
+        ];
       };
     };
     nixvim.helpers = shared.helpers;

wrappers/nixos.nix

@@ -33,7 +33,10 @@ in
           defaultPkgs = pkgs;
           inherit helpers;
         };
-        modules = [ ./modules/nixos.nix ] ++ shared.topLevelModules;
+        modules = [
+          ./modules/nixos.nix
+          ../modules/top-level
+        ];
       };
     };
     nixvim.helpers = shared.helpers;

wrappers/standalone.nix

@@ -10,10 +10,6 @@ let
   inherit (pkgs) lib;
 
   helpers = getHelpers pkgs _nixvimTests;
-  shared = import ./_shared.nix helpers {
-    inherit pkgs lib;
-    config = { };
-  };
 
   handleAssertions =
     config:
@@ -32,7 +28,8 @@ let
         modules = [
           mod
           { wrapRc = true; }
-        ] ++ shared.topLevelModules;
+          ../modules/top-level
+        ];
         specialArgs = {
           inherit helpers;
           defaultPkgs = pkgs;