65 files changed, 49 insertions, 1 deletions
diff --git a/modules/by-name-overlay.nix b/modules/by-name-overlay.nix
new file mode 100644
index 00000000..b96c1d25
--- /dev/null
+++ b/modules/by-name-overlay.nix
@@ -0,0 +1,48 @@
+# Adapted from this: https://github.com/NixOS/nixpkgs/blob/1814b56453c91192f6d5a6276079948f9fe96c18/pkgs/top-level/by-name-overlay.nix
+{baseDirectory}: let
+  # Taken straight out of the `nixpkgs/lib/lists.nix` file.
+  # We can't depended on `pkgs` (and thus on `lib`), because the `pkgs` module argument
+  # is only defined in modules we import.
+  flatten = x:
+    if builtins.isList x
+    then builtins.concatMap flatten x
+    else [x];
+  # Same thing as flatten.
+  warn =
+    # Since Nix 2.23, https://github.com/NixOS/nix/pull/10592
+    builtins.warn
+    or (
+      # Do not eta reduce v, so that we have the same strictness as `builtins.warn`.
+      msg: v:
+      # `builtins.warn` requires a string message, so we enforce that in our implementation, so that callers aren't accidentally incompatible with newer Nix versions.
+        assert builtins.isString msg;
+          builtins.trace "[1;35mevaluation warning:[0m ${msg}" v
+    );
+  # Same thing as flatten.
+  mapAttrsToList = f: attrs:
+    builtins.map (name: f name attrs.${name}) (builtins.attrNames attrs);
+
+  # Module files for a single shard
+  # Type: String -> String -> ListOf Path
+  namesForShard = shard: type:
+    if type != "directory"
+    then warn "Ignored non-directory, whilst importing by-name modules: '${shard}'" []
+    else let
+      mkPath = name: _type: let
+        path = baseDirectory + "/${shard}/${name}/module.nix";
+      in
+        if builtins.pathExists path
+        then path
+        else warn "'${builtins.toString path}' does not exist. Skipped" null;
+    in
+      flatten
+      (builtins.filter (it: it != null)
+        (mapAttrsToList
+          mkPath
+          (builtins.readDir (baseDirectory + "/${shard}"))));
+
+  # A list of all module paths.
+  # These can the be simply injected into `import`
+  moduleFiles = flatten (mapAttrsToList namesForShard (builtins.readDir baseDirectory));
+in
+  moduleFiles
diff --git a/modules/system/services/adb/default.nix b/modules/by-name/ad/adb/module.nix
index ec5d4be6..ec5d4be6 100644
--- a/modules/system/services/adb/default.nix
+++ b/modules/by-name/ad/adb/module.nix
diff --git a/modules/system/services/backup/default.nix b/modules/by-name/ba/backup/module.nix
index 92700bf2..92700bf2 100644
--- a/modules/system/services/backup/default.nix
+++ b/modules/by-name/ba/backup/module.nix
diff --git a/modules/system/bluetooth/default.nix b/modules/by-name/bl/bluetooth/module.nix
index bf1c6a90..bf1c6a90 100644
--- a/modules/system/bluetooth/default.nix
+++ b/modules/by-name/bl/bluetooth/module.nix
diff --git a/modules/home/conf/swaylock/gnu.png b/modules/by-name/bo/boot/boot_pictures/gnu.png
index d07dee3e..d07dee3e 100644..100755
--- a/modules/home/conf/swaylock/gnu.png
+++ b/modules/by-name/bo/boot/boot_pictures/gnu.png
diff --git a/modules/system/boot/boot_pictures/gnulin_emb_1.png b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_1.png
index 483f2681..483f2681 100755
--- a/modules/system/boot/boot_pictures/gnulin_emb_1.png
+++ b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_1.png
diff --git a/modules/system/boot/boot_pictures/gnulin_emb_2.png b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_2.png
index 48cd6ad7..48cd6ad7 100755
--- a/modules/system/boot/boot_pictures/gnulin_emb_2.png
+++ b/modules/by-name/bo/boot/boot_pictures/gnulin_emb_2.png
diff --git a/modules/system/boot/iso_entry/archlive_iso.nix b/modules/by-name/bo/boot/iso_entry/archlive_iso.nix
index d19a4a87..d19a4a87 100644
--- a/modules/system/boot/iso_entry/archlive_iso.nix
+++ b/modules/by-name/bo/boot/iso_entry/archlive_iso.nix
diff --git a/modules/system/boot/iso_entry/signing_key.nix b/modules/by-name/bo/boot/iso_entry/signing_key.nix
index 788447be..788447be 100644
--- a/modules/system/boot/iso_entry/signing_key.nix
+++ b/modules/by-name/bo/boot/iso_entry/signing_key.nix
diff --git a/modules/system/boot/default.nix b/modules/by-name/bo/boot/module.nix
index 711e9d23..711e9d23 100644
--- a/modules/system/boot/default.nix
+++ b/modules/by-name/bo/boot/module.nix
diff --git a/modules/system/cleanup/default.nix b/modules/by-name/cl/cleanup/module.nix
index f8307b73..f8307b73 100644
--- a/modules/system/cleanup/default.nix
+++ b/modules/by-name/cl/cleanup/module.nix
diff --git a/modules/system/services/dconf/default.nix b/modules/by-name/dc/dconf/module.nix
index e4a1c7a9..e4a1c7a9 100644
--- a/modules/system/services/dconf/default.nix
+++ b/modules/by-name/dc/dconf/module.nix
diff --git a/modules/system/disks/fstrim.nix b/modules/by-name/di/disks/fstrim.nix
index 6daeb65e..6daeb65e 100644
--- a/modules/system/disks/fstrim.nix
+++ b/modules/by-name/di/disks/fstrim.nix
diff --git a/modules/system/disks/hibernate.nix b/modules/by-name/di/disks/hibernate.nix
index a50e5b57..a50e5b57 100644
--- a/modules/system/disks/hibernate.nix
+++ b/modules/by-name/di/disks/hibernate.nix
diff --git a/modules/system/disks/default.nix b/modules/by-name/di/disks/module.nix
index c0e5bcfd..c0e5bcfd 100644
--- a/modules/system/disks/default.nix
+++ b/modules/by-name/di/disks/module.nix
diff --git a/modules/system/documentation/default.nix b/modules/by-name/do/documentation/module.nix
index 4616a991..4616a991 100644
--- a/modules/system/documentation/default.nix
+++ b/modules/by-name/do/documentation/module.nix
diff --git a/modules/system/fonts/emoji_font.xml b/modules/by-name/fo/fonts/emoji_font.xml
index f3f6bb3e..f3f6bb3e 100644
--- a/modules/system/fonts/emoji_font.xml
+++ b/modules/by-name/fo/fonts/emoji_font.xml
diff --git a/modules/system/fonts/default.nix b/modules/by-name/fo/fonts/module.nix
index abd5664b..abd5664b 100644
--- a/modules/system/fonts/default.nix
+++ b/modules/by-name/fo/fonts/module.nix
diff --git a/modules/system/services/fwupd/default.nix b/modules/by-name/fw/fwupd/module.nix
index 5ad4f467..5ad4f467 100644
--- a/modules/system/services/fwupd/default.nix
+++ b/modules/by-name/fw/fwupd/module.nix
diff --git a/modules/system/hardware/default.nix b/modules/by-name/ha/hardware/module.nix
index 850416b7..850416b7 100644
--- a/modules/system/hardware/default.nix
+++ b/modules/by-name/ha/hardware/module.nix
diff --git a/modules/system/home-manager/default.nix b/modules/by-name/ho/home-manager/module.nix
index 096aaceb..d95bb6ac 100644
--- a/modules/system/home-manager/default.nix
+++ b/modules/by-name/ho/home-manager/module.nix
@@ -28,7 +28,7 @@ in {
     home-manager = {
       useGlobalPkgs = true;
       useUserPackages = true;
-      users.soispha = import ../../home;
+      users.soispha = import ../../../home.legacy;
       extraSpecialArgs = {
         inherit
           nixpkgs_open_prs
diff --git a/modules/system/impermanence/default.nix b/modules/by-name/im/impermanence/module.nix
index 9730dde6..9730dde6 100644
--- a/modules/system/impermanence/default.nix
+++ b/modules/by-name/im/impermanence/module.nix
diff --git a/modules/system/services/issue_file/default.nix b/modules/by-name/is/issue_file/module.nix
index d8b6faa8..d8b6faa8 100644
--- a/modules/system/services/issue_file/default.nix
+++ b/modules/by-name/is/issue_file/module.nix
diff --git a/modules/system/laptop/default.nix b/modules/by-name/la/laptop/module.nix
index f70230ad..f70230ad 100644
--- a/modules/system/laptop/default.nix
+++ b/modules/by-name/la/laptop/module.nix
diff --git a/modules/system/libvirtd/default.nix b/modules/by-name/li/libvirtd/module.nix
index 5c519550..5c519550 100644
--- a/modules/system/libvirtd/default.nix
+++ b/modules/by-name/li/libvirtd/module.nix
diff --git a/modules/system/locale/keymaps/dvorak_modified.xkb b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb
index 63f5d4fb..63f5d4fb 100644
--- a/modules/system/locale/keymaps/dvorak_modified.xkb
+++ b/modules/by-name/lo/locale/keymaps/dvorak_modified.xkb
diff --git a/modules/system/locale/keymaps/us_modified.xkb b/modules/by-name/lo/locale/keymaps/us_modified.xkb
index 6299a5e9..6299a5e9 100644
--- a/modules/system/locale/keymaps/us_modified.xkb
+++ b/modules/by-name/lo/locale/keymaps/us_modified.xkb
diff --git a/modules/system/locale/default.nix b/modules/by-name/lo/locale/module.nix
index 10569216..10569216 100644
--- a/modules/system/locale/default.nix
+++ b/modules/by-name/lo/locale/module.nix
diff --git a/modules/system/networking/default.nix b/modules/by-name/ne/networking/module.nix
index c5f0e491..c5f0e491 100644
--- a/modules/system/networking/default.nix
+++ b/modules/by-name/ne/networking/module.nix
diff --git a/modules/system/services/nix/default.nix b/modules/by-name/ni/nix/module.nix
index 980bbd39..980bbd39 100644
--- a/modules/system/services/nix/default.nix
+++ b/modules/by-name/ni/nix/module.nix
diff --git a/modules/system/nixpkgs/config.nix b/modules/by-name/ni/nixpkgs/config.nix
index 1a24444d..1a24444d 100644
--- a/modules/system/nixpkgs/config.nix
+++ b/modules/by-name/ni/nixpkgs/config.nix
diff --git a/modules/system/nixpkgs/default.nix b/modules/by-name/ni/nixpkgs/module.nix
index eda3ac89..eda3ac89 100644
--- a/modules/system/nixpkgs/default.nix
+++ b/modules/by-name/ni/nixpkgs/module.nix
diff --git a/modules/system/services/openssh/default.nix b/modules/by-name/op/openssh/module.nix
index b733dbe7..b733dbe7 100644
--- a/modules/system/services/openssh/default.nix
+++ b/modules/by-name/op/openssh/module.nix
diff --git a/modules/system/services/printing/default.nix b/modules/by-name/pi/printing/module.nix
index 85d15b16..85d15b16 100644
--- a/modules/system/services/printing/default.nix
+++ b/modules/by-name/pi/printing/module.nix
diff --git a/modules/system/polkit/default.nix b/modules/by-name/po/polkit/module.nix
index fb13505b..fb13505b 100644
--- a/modules/system/polkit/default.nix
+++ b/modules/by-name/po/polkit/module.nix
diff --git a/modules/system/services/postgresql/default.nix b/modules/by-name/po/postgresql/module.nix
index c47a235c..c47a235c 100644
--- a/modules/system/services/postgresql/default.nix
+++ b/modules/by-name/po/postgresql/module.nix
diff --git a/modules/system/power/default.nix b/modules/by-name/po/power/module.nix
index 13013879..13013879 100644
--- a/modules/system/power/default.nix
+++ b/modules/by-name/po/power/module.nix
diff --git a/modules/system/services/scanning/default.nix b/modules/by-name/sc/scanning/module.nix
index dda507fa..dda507fa 100644
--- a/modules/system/services/scanning/default.nix
+++ b/modules/by-name/sc/scanning/module.nix
diff --git a/modules/system/secrets/lf/cd_paths.age b/modules/by-name/se/secrets/lf/cd_paths.age
index 3b018fb7..3b018fb7 100644
--- a/modules/system/secrets/lf/cd_paths.age
+++ b/modules/by-name/se/secrets/lf/cd_paths.age
diff --git a/modules/system/secrets/default.nix b/modules/by-name/se/secrets/module.nix
index 8b3188b0..8b3188b0 100644
--- a/modules/system/secrets/default.nix
+++ b/modules/by-name/se/secrets/module.nix
diff --git a/modules/system/secrets/secrets.nix b/modules/by-name/se/secrets/secrets.nix
index ff97c0fd..ff97c0fd 100644
--- a/modules/system/secrets/secrets.nix
+++ b/modules/by-name/se/secrets/secrets.nix
diff --git a/modules/system/secrets/serverphone/ca.key b/modules/by-name/se/secrets/serverphone/ca.key
index d49c5395..d49c5395 100644
--- a/modules/system/secrets/serverphone/ca.key
+++ b/modules/by-name/se/secrets/serverphone/ca.key
diff --git a/modules/system/secrets/serverphone/server.key b/modules/by-name/se/secrets/serverphone/server.key
index a2720406..a2720406 100644
--- a/modules/system/secrets/serverphone/server.key
+++ b/modules/by-name/se/secrets/serverphone/server.key
diff --git a/modules/system/secrets/taskserver/ca.cert b/modules/by-name/se/secrets/taskserver/ca.cert
index 203d62a8..203d62a8 100644
--- a/modules/system/secrets/taskserver/ca.cert
+++ b/modules/by-name/se/secrets/taskserver/ca.cert
diff --git a/modules/system/secrets/taskserver/credentials b/modules/by-name/se/secrets/taskserver/credentials
index f3aaf502..f3aaf502 100644
--- a/modules/system/secrets/taskserver/credentials
+++ b/modules/by-name/se/secrets/taskserver/credentials
diff --git a/modules/system/secrets/taskserver/private.key b/modules/by-name/se/secrets/taskserver/private.key
index 5afecdaf..5afecdaf 100644
--- a/modules/system/secrets/taskserver/private.key
+++ b/modules/by-name/se/secrets/taskserver/private.key
diff --git a/modules/system/secrets/taskserver/public.cert b/modules/by-name/se/secrets/taskserver/public.cert
index 1cf9b5f0..1cf9b5f0 100644
--- a/modules/system/secrets/taskserver/public.cert
+++ b/modules/by-name/se/secrets/taskserver/public.cert
diff --git a/modules/system/secrets/update_secrets.sh b/modules/by-name/se/secrets/update_secrets.sh
index f1c27d77..f1c27d77 100755
--- a/modules/system/secrets/update_secrets.sh
+++ b/modules/by-name/se/secrets/update_secrets.sh
diff --git a/modules/system/services/serverphone/certificates/ca.crt b/modules/by-name/se/serverphone/certificates/ca.crt
index 7a4ae6f9..7a4ae6f9 100644
--- a/modules/system/services/serverphone/certificates/ca.crt
+++ b/modules/by-name/se/serverphone/certificates/ca.crt
diff --git a/modules/system/services/serverphone/certificates/server.crt b/modules/by-name/se/serverphone/certificates/server.crt
index f994cdc8..f994cdc8 100644
--- a/modules/system/services/serverphone/certificates/server.crt
+++ b/modules/by-name/se/serverphone/certificates/server.crt
diff --git a/modules/system/services/serverphone/keys/key_1 b/modules/by-name/se/serverphone/keys/key_1
index 67720882..67720882 120000
--- a/modules/system/services/serverphone/keys/key_1
+++ b/modules/by-name/se/serverphone/keys/key_1
diff --git a/modules/system/services/serverphone/keys/key_2 b/modules/by-name/se/serverphone/keys/key_2
index 24df7207..24df7207 120000
--- a/modules/system/services/serverphone/keys/key_2
+++ b/modules/by-name/se/serverphone/keys/key_2
diff --git a/modules/system/services/serverphone/default.nix b/modules/by-name/se/serverphone/module.currently_ignored.nix
index 20125a75..20125a75 100644
--- a/modules/system/services/serverphone/default.nix
+++ b/modules/by-name/se/serverphone/module.currently_ignored.nix
diff --git a/modules/system/services/snapper/default.nix b/modules/by-name/sn/snapper/module.nix
index bf8201a4..bf8201a4 100644
--- a/modules/system/services/snapper/default.nix
+++ b/modules/by-name/sn/snapper/module.nix
diff --git a/modules/system/sound/default.nix b/modules/by-name/so/sound/module.nix
index f3120a67..f3120a67 100644
--- a/modules/system/sound/default.nix
+++ b/modules/by-name/so/sound/module.nix
diff --git a/modules/system/services/steam/default.nix b/modules/by-name/st/steam/module.nix
index 49149cd7..49149cd7 100644
--- a/modules/system/services/steam/default.nix
+++ b/modules/by-name/st/steam/module.nix
diff --git a/modules/system/services/swaylock/default.nix b/modules/by-name/sw/swaylock/module.nix
index 6cbcef28..6cbcef28 100644
--- a/modules/system/services/swaylock/default.nix
+++ b/modules/by-name/sw/swaylock/module.nix
diff --git a/modules/system/services/system_diff/default.nix b/modules/by-name/sy/system_diff/module.nix
index 052ffae2..052ffae2 100644
--- a/modules/system/services/system_diff/default.nix
+++ b/modules/by-name/sy/system_diff/module.nix
diff --git a/modules/system/tempfiles/default.nix b/modules/by-name/te/tempfiles/module.nix
index f8bfd4dc..f8bfd4dc 100644
--- a/modules/system/tempfiles/default.nix
+++ b/modules/by-name/te/tempfiles/module.nix
diff --git a/modules/system/users/default.nix b/modules/by-name/us/users/module.nix
index a44df7e8..a44df7e8 100644
--- a/modules/system/users/default.nix
+++ b/modules/by-name/us/users/module.nix
diff --git a/modules/system/version/default.nix b/modules/by-name/ve/version/module.nix
index 77cada14..77cada14 100644
--- a/modules/system/version/default.nix
+++ b/modules/by-name/ve/version/module.nix
diff --git a/modules/system/waydroid/default.nix b/modules/by-name/wa/waydroid/module.nix
index 4680db63..4680db63 100644
--- a/modules/system/waydroid/default.nix
+++ b/modules/by-name/wa/waydroid/module.nix
diff --git a/modules/system/services/xdg/default.nix b/modules/by-name/xd/xdg/module.nix
index 5140a832..5140a832 100644
--- a/modules/system/services/xdg/default.nix
+++ b/modules/by-name/xd/xdg/module.nix
diff --git a/modules/system/services/xdg/scripts/lf_wrapper.sh b/modules/by-name/xd/xdg/scripts/lf_wrapper.sh
index 16603fe4..16603fe4 100755
--- a/modules/system/services/xdg/scripts/lf_wrapper.sh
+++ b/modules/by-name/xd/xdg/scripts/lf_wrapper.sh
diff --git a/modules/system/services/xdg/scripts/ranger_wrapper.sh b/modules/by-name/xd/xdg/scripts/ranger_wrapper.sh
index e148bf19..e148bf19 100755
--- a/modules/system/services/xdg/scripts/ranger_wrapper.sh
+++ b/modules/by-name/xd/xdg/scripts/ranger_wrapper.sh