Add extra function for lib, and refactor with loadImports

flake.nix

@@ -2,35 +2,45 @@
   description = "A simple NixOS flakes";
 
   outputs = {
-    nixpkgs,
     flake-parts,
     flake-utils,
     home-manager,
     treefmt-nix,
+    nixpkgs,
     ...
-  } @ inputs:
+  } @ inputs: let
-    flake-parts.lib.mkFlake {inherit inputs;} {
+    nixpkgs-lib = nixpkgs.lib;
+    lib = nixpkgs-lib.extend (import ./lib);
+  in
+    flake-parts.lib.mkFlake {
+      inherit inputs;
+      specialArgs = {
+        inherit lib;
+        rootPath = ./.;
+      };
+    } ({lib, ...}: {
       systems = flake-utils.lib.defaultSystems;
-      imports = [
+      imports =
-        home-manager.flakeModules.home-manager
+        [
-        treefmt-nix.flakeModule
+          home-manager.flakeModules.home-manager
-
+          treefmt-nix.flakeModule
-        ./flake
+        ]
-      ];
+        ++ lib.youthlic.loadImports ./flake;
       flake = {
+        inherit lib;
         nix.settings = {
           # substituters shared in home-manager and nixos configuration
           substituters = let
             cachix = x: "https://${x}.cachix.org";
           in
-            nixpkgs.lib.flatten [
+            lib.flatten [
               (cachix "nix-community")
               "https://cache.nixos.org"
               (cachix "cosmic")
             ];
         };
       };
-    };
+    });
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

flake/default.nix

@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./nixos.nix
-    ./home.nix
-    ./templates.nix
-    ./perSystem.nix
-    ./deploy.nix
-    ./overlays.nix
-  ];
-}

flake/home.nix

@@ -2,9 +2,9 @@
   lib,
   inputs,
   self,
+  rootPath,
   ...
 }: let
-  rootPath = ./..;
   inherit (self) outputs;
   homeModules =
     (
@@ -46,6 +46,11 @@
         ])
         ++ [
           homeModules."${unixName}"
+        ]
+        ++ [
+          {
+            lib = {inherit (lib) youthlic;};
+          }
         ];
       extraSpecialArgs = {
         inherit

flake/nixos.nix

@@ -2,11 +2,10 @@
   inputs,
   lib,
   self,
+  rootPath,
   ...
 }: let
-  rootPath = ./..;
   inherit (self) outputs;
-  inherit (inputs) nixpkgs;
 in {
   flake = {
     nixosModules = {
@@ -15,10 +14,10 @@ in {
     };
     nixosConfigurations = let
       makeNixosConfiguration = hostName:
-        nixpkgs.lib.nixosSystem {
+        lib.nixosSystem {
           modules = [(rootPath + "/nixos/configurations/${hostName}")];
           specialArgs = {
-            inherit inputs outputs rootPath;
+            inherit inputs outputs rootPath lib;
           };
         };
     in

flake/overlays.nix

@@ -2,9 +2,9 @@
   self,
   inputs,
   lib,
+  rootPath,
   ...
 }: let
-  rootPath = ./..;
   inherit (self) outputs;
   importWithArgs = lib.flip import {inherit inputs outputs;};
 in {

flake/perSystem.nix

@@ -1,6 +1,8 @@
-{inputs, ...}: let
+{
-  rootPath = ./..;
+  inputs,
-in {
+  rootPath,
+  ...
+}: {
   imports = [
     (rootPath + "/treefmt.nix")
   ];
@@ -12,7 +14,7 @@ in {
     ...
   }: let
     inherit (inputs) nixpkgs;
-    callPackages = lib.callPackagesWith (pkgs // {inherit callPackages inputs rootPath;});
+    callPackages = lib.callPackagesWith (pkgs // {inherit callPackages inputs rootPath lib;});
   in {
     _module.args.pkgs = import nixpkgs {
       inherit system;

flake/templates.nix

@@ -1,10 +1,9 @@
 {
   flake-parts-lib,
   lib,
+  rootPath,
   ...
-}: let
+}: {
-  rootPath = ./..;
-in {
   options = {
     flake = flake-parts-lib.mkSubmoduleOptions {
       templates = lib.mkOption {

home/david/configurations/Akun/default.nix

@@ -1,12 +1,11 @@
 {
   pkgs,
+  lib,
   unixName,
   config,
   ...
 }: {
-  imports = [
+  imports = lib.youthlic.loadImports ./.;
-    ./niri.nix
-  ];
   youthlic = {
     xdg-dirs.enable = true;
     programs = let

home/david/configurations/Tytonidae/default.nix

@@ -1,12 +1,11 @@
 {
   pkgs,
+  lib,
   config,
   unixName,
   ...
 }: {
-  imports = [
+  imports = lib.youthlic.loadImports ./.;
-    ./niri.nix
-  ];
   youthlic = {
     xdg-dirs.enable = true;
     programs = let

home/david/modules/default.nix

@@ -1,9 +1,9 @@
-{pkgs, ...}: {
+{
-  imports = [
+  lib,
-    ./wallpaper.nix
+  pkgs,
-    ./programs
+  ...
-    ./emails.nix
+}: {
-  ];
+  imports = lib.youthlic.loadImports ./.;
   config = {
     youthlic.programs = {
       zoxide.enable = true;

home/david/modules/programs/default.nix

@@ -1,22 +1,3 @@
-{...}: {
+{lib, ...}: {
-  imports = [
+  imports = lib.youthlic.loadImports ./.;
-    ./openssh.nix
-    ./niri
-    ./wluma.nix
-    ./helix.nix
-    ./firefox.nix
-    ./waybar.nix
-    ./zed.nix
-    ./alacritty
-    ./ghostty.nix
-    ./fuzzel.nix
-    ./mpv.nix
-    ./swaylock.nix
-    ./thunderbird.nix
-    ./chromium.nix
-    ./foot
-    ./swaync.nix
-    ./espanso.nix
-    ./waypaper.nix
-  ];
 }

home/extra/default.nix

@@ -1,11 +1,13 @@
-{inputs, ...}: {
+{
+  lib,
+  inputs,
+  ...
+}: {
   imports =
     (with inputs; [
       niri-flake.homeModules.niri
       stylix.homeManagerModules.stylix
       chaotic.homeManagerModules.default
     ])
-    ++ [
+    ++ (lib.youthlic.loadImports ./.);
-      ./nix.nix
-    ];
 }

home/modules/default.nix

@@ -1,14 +1,14 @@
-{inputs, ...}: {
+{
+  lib,
+  inputs,
+  ...
+}: {
   imports =
     (with inputs; [
       sops-nix.homeManagerModules.sops
       betterfox-nix.homeManagerModules.betterfox
     ])
-    ++ [
+    ++ lib.youthlic.loadImports ./.;
-      ./programs
-      ./xdg-dirs.nix
-      ./i18n
-    ];
 
   config = {
     programs.direnv = {

home/modules/programs/default.nix

@@ -1,21 +1,3 @@
-{...}: {
+{lib, ...}: {
-  imports = [
+  imports = lib.youthlic.loadImports ./.;
-    ./rustypaste-cli.nix
-    ./atuin.nix
-    ./bash.nix
-    ./fish.nix
-    ./kvm.nix
-    ./starship
-    ./gpg
-    ./sops.nix
-    ./git.nix
-    ./helix
-    ./jujutsu.nix
-    ./yazi.nix
-    ./zoxide.nix
-    ./fzf.nix
-    ./eza.nix
-    ./ion.nix
-    ./awscli.nix
-  ];
 }

lib/default.nix

@@ -0,0 +1,17 @@
+final: _prev: {
+  youthlic = {
+    loadImports' = dir: f:
+      if (builtins.pathExists dir && (builtins.readFileType dir) == "directory")
+      then
+        with final;
+          pipe dir [
+            builtins.readDir
+            attrNames
+            (filter (name: name != "default.nix"))
+            f
+            (map (name: dir + "/${name}"))
+          ]
+      else [];
+    loadImports = with final; flip youthlic.loadImports' (x: x);
+  };
+}

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 = [
+  imports =
-    ./forgejo.nix
+    [
-    ./networking.nix
+      outputs.nixosModules.default
-    ./stylix.nix
+    ]
-    ./hardware-configuration.nix
+    ++ (lib.youthlic.loadImports ./.);
-    ./users
-    ./disko-config.nix
-    ./miniflux.nix
-    ./radicle.nix
-
-    outputs.nixosModules.default
-  ];
 
   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
     ])
-    ++ [
+    ++ (with outputs; [
-      ./users
+      nixosModules.gui
-      ./stylix.nix
+    ])
-      ./gui.nix
+    ++ (lib.youthlic.loadImports ./.);
-
-      # 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
-    ];
 
   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 = [
+  imports = lib.youthlic.loadImports ./.;
-    ./forgejo.nix
-    ./miniflux.nix
-  ];
   options = {
     youthlic.containers = {
       enable = lib.mkEnableOption "containers";

nixos/modules/default.nix

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

nixos/modules/gui/default.nix

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

nixos/modules/programs/caddy/default.nix

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

nixos/modules/programs/default.nix

@@ -1,33 +1,3 @@
-{...}: {
+{lib, ...}: {
-  imports = [
+  imports = lib.youthlic.loadImports ./.;
-    ./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
-  ];
 }

nixos/modules/programs/juicity/default.nix

@@ -6,9 +6,7 @@
 }: let
   cfg = config.youthlic.programs.juicity;
 in {
-  imports = [
+  imports = lib.youthlic.loadImports ./.;
-    ./template.nix
-  ];
   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 = [
+  imports = lib.youthlic.loadImports ./.;
-    ./template.nix
-  ];
 
   options = {
     youthlic.programs.rustypaste = {

nixos/modules/virtualisation/default.nix

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