16 files changed, 22 insertions, 16 deletions
diff --git a/modules/nixos/vhack/etesync/default.nix b/modules/by-name/et/etesync/module.nix
index 0f6c565..0f6c565 100644
--- a/modules/nixos/vhack/etesync/default.nix
+++ b/modules/by-name/et/etesync/module.nix
diff --git a/modules/nixos/vhack/etesync/secret_file.age b/modules/by-name/et/etesync/secret_file.age
index 8d8e3c2..8d8e3c2 100644
--- a/modules/nixos/vhack/etesync/secret_file.age
+++ b/modules/by-name/et/etesync/secret_file.age
diff --git a/modules/nixos/vhack/git-server/css.nix b/modules/by-name/gi/git-server/css.nix
index 3d73ea0..3d73ea0 100644
--- a/modules/nixos/vhack/git-server/css.nix
+++ b/modules/by-name/gi/git-server/css.nix
diff --git a/modules/nixos/vhack/git-server/default.nix b/modules/by-name/gi/git-server/module.nix
index a374f4c..a374f4c 100644
--- a/modules/nixos/vhack/git-server/default.nix
+++ b/modules/by-name/gi/git-server/module.nix
diff --git a/modules/nixos/vhack/nginx/default.nix b/modules/by-name/ng/nginx/module.nix
index 6a82147..6a82147 100644
--- a/modules/nixos/vhack/nginx/default.nix
+++ b/modules/by-name/ng/nginx/module.nix
diff --git a/modules/nixos/vhack/nginx/redirects.nix b/modules/by-name/ng/nginx/redirects.nix
index a021e72..a021e72 100644
--- a/modules/nixos/vhack/nginx/redirects.nix
+++ b/modules/by-name/ng/nginx/redirects.nix
diff --git a/modules/nixos/vhack/nix-sync/hosts.nix b/modules/by-name/ni/nix-sync/hosts.nix
index 98dbbf1..98dbbf1 100644
--- a/modules/nixos/vhack/nix-sync/hosts.nix
+++ b/modules/by-name/ni/nix-sync/hosts.nix
diff --git a/modules/nixos/vhack/nix-sync/module.nix b/modules/by-name/ni/nix-sync/internal_module.nix
index a3ab0af..a3ab0af 100644
--- a/modules/nixos/vhack/nix-sync/module.nix
+++ b/modules/by-name/ni/nix-sync/internal_module.nix
diff --git a/modules/nixos/vhack/nix-sync/default.nix b/modules/by-name/ni/nix-sync/module.nix
index a624e0e..0a92888 100644
--- a/modules/nixos/vhack/nix-sync/default.nix
+++ b/modules/by-name/ni/nix-sync/module.nix
@@ -40,7 +40,7 @@
   domains = import ./hosts.nix {};
 in {
   imports = [
-    ./module.nix
+    ./internal_module.nix
   ];
 
   options.vhack.nix-sync = {
diff --git a/modules/nixos/vhack/openssh/default.nix b/modules/by-name/op/openssh/module.nix
index 30d16a6..30d16a6 100644
--- a/modules/nixos/vhack/openssh/default.nix
+++ b/modules/by-name/op/openssh/module.nix
diff --git a/modules/nixos/vhack/peertube/default.nix b/modules/by-name/pe/peertube/module.nix
index 29d1d07..29d1d07 100644
--- a/modules/nixos/vhack/peertube/default.nix
+++ b/modules/by-name/pe/peertube/module.nix
diff --git a/modules/nixos/vhack/peertube/secrets/general.age b/modules/by-name/pe/peertube/secrets/general.age
index 854ab1a..854ab1a 100644
--- a/modules/nixos/vhack/peertube/secrets/general.age
+++ b/modules/by-name/pe/peertube/secrets/general.age
diff --git a/modules/nixos/vhack/peertube/secrets/smtp.age b/modules/by-name/pe/peertube/secrets/smtp.age
index 1979ea7..1979ea7 100644
--- a/modules/nixos/vhack/peertube/secrets/smtp.age
+++ b/modules/by-name/pe/peertube/secrets/smtp.age
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..61d259d
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,21 @@
+{nixLib, ...}: let
+  files =
+    builtins.attrValues
+    (nixLib.mkByName {
+      baseDirectory = ./by-name;
+      fileName = "module.nix";
+
+      # We only want the base paths.
+      finalizeFunction = name: value: value;
+
+      # TODO: Re-activate, when/if most modules have tests.  <2024-11-23>
+      # coImportsNameFunction = {
+      #   shard,
+      #   name,
+      # }:
+      #   ../tests/by-name + "/${shard}" + "/${name}" + "/test.nix";
+      # coImportsWarnMessageObject = "test";
+    });
+in {
+  imports = files;
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index fa21596..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./vhack
-  ];
-}
diff --git a/modules/nixos/vhack/default.nix b/modules/nixos/vhack/default.nix
deleted file mode 100644
index bed22af..0000000
--- a/modules/nixos/vhack/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  imports = [
-    ./etesync
-    ./git-server
-    ./nginx
-    ./nix-sync
-    ./openssh
-    ./peertube
-  ];
-}