bulk: 2026-03-15

nix/flake/per-system/args/default.nix

@@ -1,10 +1,13 @@
 {
+  lib,
   ...
 }:
 
+let
+  inherit (lib.my)
+    collectImports
+    ;
+in
 {
-  imports = [
-    ./lib.nix
-    ./pkgs.nix
-  ];
+  imports = collectImports ./.;
 }

nix/flake/per-system/default.nix

@@ -1,13 +1,13 @@
 {
+  lib,
   ...
 }:
 
+let
+  inherit (lib.my)
+    collectImports
+    ;
+in
 {
-  imports = [
-    ./apps
-    ./args
-    ./checks
-    ./dev-shells.nix
-    ./pre-commit.nix
-  ];
+  imports = collectImports ./.;
 }

nix/hosts/mephistopheles/boot/default.nix

@@ -1,14 +1,16 @@
 {
+  lib,
   pkgs,
   ...
 }:
 
+let
+  inherit (lib.my)
+    collectImports
+    ;
+in
 {
-  imports = [
-    ./plymouth.nix
-    ./regdomain.nix
-    ./zswap.nix
-  ];
+  imports = collectImports ./.;
 
   boot = {
     initrd.systemd.enable = true;

nix/hosts/mephistopheles/default.nix

@@ -1,29 +1,15 @@
 {
+  lib,
   ...
 }:
 
+let
+  inherit (lib.my)
+    collectImports
+    ;
+in
 {
-  imports = [
-    ./android.nix
-    ./bluetooth.nix
-    ./boot
-    ./disk-config.nix
-    ./display-manager.nix
-    ./file-systems.nix
-    ./fonts.nix
-    ./gaming.nix
-    ./gnome.nix
-    ./hardware
-    ./impermanence.nix
-    ./input.nix
-    ./locale.nix
-    ./multimedia.nix
-    ./networking
-    ./nix
-    ./security.nix
-    ./sops.nix
-    ./users.nix
-  ];
+  imports = collectImports ./.;
 
   services = {
     gvfs.enable = true; # required for "Trash"

nix/hosts/mephistopheles/hardware/configuration.nix

@@ -11,6 +11,7 @@
 {
   imports = [
     inputs'.nixpkgs.nixosModules.notDetected
+    inputs'.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel-gen7
   ];
 
   boot.initrd.availableKernelModules = [

nix/hosts/mephistopheles/hardware/default.nix

@@ -1,22 +1,17 @@
 {
   config,
-  inputs',
+  lib,
   userConfig,
   ...
 }:
 
+let
+  inherit (lib.my)
+    collectImports
+    ;
+in
 {
-  imports = [
-    ./battery.nix
-    ./configuration.nix
-    ./graphics.nix
-    ./keyboard.nix
-    ./monitor.nix
-    ./mouse.nix
-    ./printer.nix
-    ./thunderbolt.nix
-    inputs'.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel-gen7
-  ];
+  imports = collectImports ./.;
 
   # TODO switch to facter after NixOS 26.05
   # hardware.facter.reportPath = ./facter.json;

nix/hosts/mephistopheles/networking/default.nix

@@ -10,6 +10,10 @@ let
     optional
     ;
 
+  inherit (lib.my)
+    collectImports
+    ;
+
   # https://userbase.kde.org/KDEConnect#I_have_two_devices_running_KDE_Connect_on_the_same_network,_but_they_can't_see_each_other
   kdeConnectPortRange = {
     from = 1714;
@@ -18,10 +22,7 @@ let
 in
 
 {
-  imports = [
-    ./secure-shell.nix
-    ./synchronization.nix
-  ];
+  imports = collectImports ./.;
 
   networking = {
     hostName = "mephistopheles";

nix/hosts/mephistopheles/nix/default.nix

@@ -12,15 +12,13 @@ let
     imap1
     mkForce
     ;
+
+  inherit (lib.my)
+    collectImports
+    ;
 in
 {
-  imports = [
-    ./angrr.nix
-    ./envfs.nix
-    ./nix-ld.nix
-    ./nixos-cli.nix
-    ./nixseparatedebuginfod2.nix
-  ];
+  imports = collectImports ./.;
 
   nix = {
     package = pkgs.unstable.nixVersions.latest;

nix/lib/my.nix

@@ -4,13 +4,17 @@
 
 let
   inherit (builtins)
+    attrNames
     baseNameOf
     convertHash
+    pathExists
     readDir
     hashString
     ;
 
   inherit (lib)
+    filterAttrs
+    hasSuffix
     id
     isAttrs
     isPath
@@ -28,6 +32,19 @@ let
   INFINITY = 1.0e308 * 2;
 in
 {
+  collectImports =
+    dir:
+    let
+      isImportable =
+        name: type:
+        if type == "directory" then
+          pathExists (dir + "/${name}/default.nix")
+        else
+          hasSuffix ".nix" name && name != "default.nix";
+      entries = filterAttrs isImportable (readDir dir);
+    in
+    map (name: dir + "/${name}") (attrNames entries);
+
   flakeInputStorePath =
     { narHash, ... }:
     let