diff --git a/flake/default.nix b/flake/default.nix
index 72b1e5a2..52506c3e 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./dev
+    ./flake-modules
     ./lib.nix
     ./legacy-packages.nix
     ./overlays.nix
diff --git a/flake/flake-modules/default.nix b/flake/flake-modules/default.nix
new file mode 100644
index 00000000..75d3058f
--- /dev/null
+++ b/flake/flake-modules/default.nix
@@ -0,0 +1,18 @@
+{ inputs, ... }:
+let
+  # Modules for the flakeModules output and the default module
+  defaultModules = { };
+
+  # Modules for the flakeModules output, but not the default module
+  extraModules = {
+    default.imports = builtins.attrValues defaultModules;
+  };
+in
+{
+  imports = [
+    inputs.flake-parts.flakeModules.flakeModules
+    extraModules.default
+  ];
+
+  flake.flakeModules = defaultModules // extraModules;
+}