Add extra function for lib, and refactor with loadImports

nixos/configurations/Akun/default.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   pkgs,
+  lib,
   outputs,
   ...
 }: {
@@ -11,15 +12,9 @@
       common-pc-laptop-ssd
     ])
     ++ [
-      ./gui.nix
-      ./hardware-configuration.nix
-      ./stylix.nix
-      ./users
-      ./networking.nix
-      ./disk-config.nix
-
       outputs.nixosModules.gui
-    ];
+    ]
+    ++ (lib.youthlic.loadImports ./.);
 
   youthlic = {
     users.deploy.enable = true;

nixos/configurations/Cape/default.nix

@@ -1,20 +1,14 @@
 {
   pkgs,
+  lib,
   outputs,
   ...
 }: {
-  imports = [
-    ./forgejo.nix
-    ./networking.nix
-    ./stylix.nix
-    ./hardware-configuration.nix
-    ./users
-    ./disko-config.nix
-    ./miniflux.nix
-    ./radicle.nix
-
-    outputs.nixosModules.default
-  ];
+  imports =
+    [
+      outputs.nixosModules.default
+    ]
+    ++ (lib.youthlic.loadImports ./.);
 
   youthlic = {
     home-manager = {

nixos/configurations/Tytonidae/default.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   inputs,
   outputs,
   ...
@@ -13,21 +14,10 @@
       common-pc-laptop-ssd
       asus-battery
     ])
-    ++ [
-      ./users
-      ./stylix.nix
-      ./gui.nix
-
-      # Include the hardware related config
-      ./hardware-configuration.nix
-      ./networking.nix
-      ./disk-config.nix
-      ./hardware.nix
-      ./specialisation/kde.nix
-      ./specialisation/niri-hybrid.nix
-
-      outputs.nixosModules.gui
-    ];
+    ++ (with outputs; [
+      nixosModules.gui
+    ])
+    ++ (lib.youthlic.loadImports ./.);
 
   youthlic = {
     home-manager = {

nixos/configurations/Tytonidae/specialisation/default.nix

@@ -0,0 +1,3 @@
+{lib, ...}: {
+  imports = lib.youthlic.loadImports ./.;
+}

nixos/modules/containers/default.nix

@@ -5,10 +5,7 @@
 }: let
   cfg = config.youthlic.containers;
 in {
-  imports = [
-    ./forgejo.nix
-    ./miniflux.nix
-  ];
+  imports = lib.youthlic.loadImports ./.;
   options = {
     youthlic.containers = {
       enable = lib.mkEnableOption "containers";

nixos/modules/default.nix

@@ -1,15 +1,3 @@
-{
-  imports = [
-    ./containers
-    ./deploy
-    ./nix.nix
-    ./home.nix
-    ./sops.nix
-    ./i18n.nix
-    ./gui
-    ./programs
-    ./hardware.nix
-    ./virtualisation
-    ./documentation.nix
-  ];
+{lib, ...}: {
+  imports = with lib; youthlic.loadImports' ./. (filter (name: name != "top-level"));
 }

nixos/modules/gui/default.nix

@@ -6,11 +6,7 @@
 }: let
   cfg = config.youthlic.gui;
 in {
-  imports = [
-    ./niri.nix
-    ./cosmic.nix
-    ./kde.nix
-  ];
+  imports = with lib; youthlic.loadImports ./.;
   options = {
     youthlic.gui = {
       enabled = lib.mkOption {

nixos/modules/programs/caddy/default.nix

@@ -5,11 +5,7 @@
 }: let
   cfg = config.youthlic.programs.caddy;
 in {
-  imports = [
-    ./radicle-explorer.nix
-    ./OuterWildsTextAdventure.nix
-    ./garage.nix
-  ];
+  imports = lib.youthlic.loadImports ./.;
   options = {
     youthlic.programs.caddy = {
       enable = lib.mkEnableOption "caddy";

nixos/modules/programs/default.nix

@@ -1,33 +1,3 @@
-{...}: {
-  imports = [
-    ./transfer-sh.nix
-    ./rustypaste
-    ./mautrix-telegram.nix
-    ./caddy
-    ./dae
-    ./forgejo.nix
-    ./kanata.nix
-    ./nh.nix
-    ./open-webui.nix
-    ./openssh.nix
-    ./postgresql.nix
-    ./steam.nix
-    ./tailscale.nix
-    ./transmission.nix
-    ./nix-ld.nix
-    ./juicity
-    ./miniflux.nix
-    ./guix.nix
-    ./asusd.nix
-    ./owncast.nix
-    ./minio.nix
-    ./supergfxd.nix
-    ./radicle.nix
-    ./wshowkeys.nix
-    ./bash.nix
-    ./obs.nix
-    ./sudo-rs.nix
-    ./garage.nix
-    ./nixvim
-  ];
+{lib, ...}: {
+  imports = lib.youthlic.loadImports ./.;
 }

nixos/modules/programs/juicity/default.nix

@@ -6,9 +6,7 @@
 }: let
   cfg = config.youthlic.programs.juicity;
 in {
-  imports = [
-    ./template.nix
-  ];
+  imports = lib.youthlic.loadImports ./.;
   options = {
     youthlic.programs.juicity = {
       client = {

nixos/modules/programs/nixvim/default.nix

@@ -5,7 +5,7 @@
 }: let
   cfg = config.youthlic.programs.nixvim;
 in {
-  imports = [./option.nix];
+  imports = lib.youthlic.loadImports ./.;
   options = {
     youthlic.programs.nixvim = {
       enable = lib.mkEnableOption "nixvim";

nixos/modules/programs/rustypaste/default.nix

@@ -5,9 +5,7 @@
 }: let
   cfg = config.youthlic.programs.rustypaste;
 in {
-  imports = [
-    ./template.nix
-  ];
+  imports = lib.youthlic.loadImports ./.;
 
   options = {
     youthlic.programs.rustypaste = {

nixos/modules/virtualisation/default.nix

@@ -1,6 +1,3 @@
-{
-  imports = [
-    ./kvm.nix
-    ./waydroid.nix
-  ];
+{lib, ...}: {
+  imports = lib.youthlic.loadImports ./.;
 }