lib: use builtinModules and extraModules instead of hardcoded paths

This commit is contained in:
yunfachi 2026-05-04 18:40:13 +03:00
parent 6956b5e817
commit 565ba0c985
No known key found for this signature in database
GPG key ID: 9D16EF5F68A5CEDF
3 changed files with 5 additions and 22 deletions

View file

@ -1,20 +0,0 @@
{
imports = [
./modules/apps.nix
./modules/checks.nix
./modules/debug.nix
./modules/devShells.nix
./modules/flake.nix
./modules/formatter.nix
./modules/legacyPackages.nix
./modules/moduleWithSystem.nix
./modules/nixosConfigurations.nix
./modules/nixosModules.nix
./modules/nixpkgs.nix
./modules/overlays.nix
./modules/packages.nix
./modules/perSystem.nix
./modules/transposition.nix
./modules/withSystem.nix
];
}

View file

@ -9,6 +9,7 @@
let let
lib = import ./lib.nix { lib = import ./lib.nix {
inherit (nixpkgs-lib) lib; inherit (nixpkgs-lib) lib;
inherit builtinModules extraModules;
# Extra info for version check message # Extra info for version check message
revInfo = revInfo =
if nixpkgs-lib?rev if nixpkgs-lib?rev

View file

@ -1,4 +1,6 @@
{ lib { lib
, builtinModules
, extraModules
# Optionally a string with extra version info to be included in the error message # Optionally a string with extra version info to be included in the error message
# in case is lib is out of date. Empty or starts with space. # in case is lib is out of date. Empty or starts with space.
, revInfo ? "" , revInfo ? ""
@ -139,7 +141,7 @@ let
inherit self flake-parts-lib moduleLocation; inherit self flake-parts-lib moduleLocation;
inputs = args.inputs or /* legacy, warned above */ self.inputs; inputs = args.inputs or /* legacy, warned above */ self.inputs;
} // specialArgs; } // specialArgs;
modules = [ ./all-modules.nix (lib.setDefaultModuleLocation errorLocation module) ]; modules = builtins.attrValues builtinModules ++ [ (lib.setDefaultModuleLocation errorLocation module) ];
class = "flake"; class = "flake";
} }
); );
@ -294,7 +296,7 @@ let
_class = "flake"; _class = "flake";
imports = [ imports = [
module module
./extras/modules.nix extraModules.modules
]; ];
flake.modules.flake.${name} = module; flake.modules.flake.${name} = module;
}; };