umport is ultimate now

lib/builder/options.nix

@@ -12,6 +12,7 @@ with types;
   # ylib & stylix
   customPkgs = name: pkgs.callPackage "${self}/pkgs/${name}";
   umport = import ./umport.nix { inherit lib; };
+  baseName = lib.filter (path: baseNameOf path == "default.nix");
 
   # enable = true; ++ enable = false;
   on.enable = true;

modules/home/default.nix

@@ -1,41 +1,13 @@
-{ lib, ... }:
 {
-  imports = lib.x.umport {
-    path = ./.;
-    include = [
-      ./programs/gui/qutebrowser/default.nix
-      ./programs/gui/telegram/default.nix
-      ./programs/cli/joshuto/default.nix
-      ./wm/terminals/kitty/default.nix
-      ./programs/cli/helix/default.nix
-      ./programs/cli/yazi/default.nix
-      ./programs/gui/mpv/default.nix
-      ./shells/translate/default.nix
-      ./wm/misc/waybar/default.nix
-      ./wm/hyprland/default.nix
-      ./shells/fish/default.nix
-      ./shells/zsh/default.nix
-      ./themes/qt/default.nix
-      ./misc/xdg/default.nix
-      ./wm/sway/default.nix
-    ];
-    exclude = [
-      ./default.nix
-      ./programs/gui/qutebrowser
-      ./programs/gui/telegram
-      ./programs/cli/joshuto
-      ./wm/terminals/kitty
-      ./programs/cli/helix
-      ./programs/cli/yazi
-      ./programs/gui/mpv
-      ./shells/translate
-      ./wm/misc/waybar
-      ./wm/hyprland
-      ./shells/fish
-      ./shells/zsh
-      ./themes/qt
-      ./misc/xdg
-      ./wm/sway
-    ];
-  };
+  lib,
+  ...
+}:
+
+{
+  imports = lib.x.baseName (
+    lib.x.umport {
+      path = ./.;
+      exclude = [ ./default.nix ];
+    }
+  );
 }

modules/home/wm/misc/waybar/default.nix

@@ -25,7 +25,7 @@ in
         mainBar =
           let
             Tool.tooltip = false;
-            ico = import ./icons;
+            ico = import ./icons.nix;
             wm_icons = ico.wm;
             bat_icons = ico.bat;
             light_icons = ico.light;

modules/nixos/default.nix

@@ -1,16 +1,13 @@
-{ lib, ... }:
 {
-  imports = lib.x.umport {
-    path = ./.;
-    # include & exclude files/directories
-    include = [
-      ./themes/stylix/default.nix
-      ./misc/users/default.nix
-    ];
-    exclude = [
-      ./default.nix
-      ./themes/stylix
-      ./misc/users
-    ];
-  };
+  lib,
+  ...
+}:
+
+{
+  imports = lib.x.baseName (
+    lib.x.umport {
+      path = ./.;
+      exclude = [ ./default.nix ];
+    }
+  );
 }