uxe nixpkgs lib to replace importDir

This commit is contained in:
Vinzenz Schroeter 2025-09-15 23:30:28 +02:00
parent 2c00ad065b
commit bd00284332
2 changed files with 13 additions and 13 deletions

View file

@ -132,17 +132,14 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
} }
); );
importModuleDir =
directory:
nixpkgs.lib.packagesFromDirectoryRecursive {
inherit directory;
callPackage = path: _args: path;
};
in in
{ {
lib = {
importDir =
dir:
(lib.attrsets.mapAttrs' (
m: _:
lib.attrsets.nameValuePair (lib.strings.removeSuffix ".nix" m) { imports = [ "${dir}/${m}" ]; }
) (builtins.readDir dir));
};
overlays = { overlays = {
unstable-packages = final: prev: { unstable-packages = final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
@ -151,7 +148,7 @@
}; };
}; };
nixosModules = (self.lib.importDir ./nixosModules) // { nixosModules = (importModuleDir ./nixosModules) // {
niri = { niri = {
imports = [ niri.nixosModules.niri ]; imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ]; nixpkgs.overlays = [ niri.overlays.niri ];
@ -168,8 +165,11 @@
}; };
}; };
homeModules = self.lib.importDir ./homeModules; homeModules = importModuleDir ./homeModules;
homeConfigurations = self.lib.importDir ./homeConfigurations; homeConfigurations = {
vinzenz = ./homeConfigurations/vinzenz;
ronja = ./homeConfigurations/ronja;
};
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);

View file

@ -3,4 +3,4 @@ set -euxo pipefail
nix fmt nix fmt
nix flake check --all-systems --show-trace nix flake check --show-trace