nikkuss/nix-meow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work on lib

Browse Source
This commit is contained in:
Nikkuss
2025-10-15 19:18:40 +00:00
parent 99af1b2af9
commit d3f26e8b8a
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib.nix
View File

@@ -13,13 +13,9 @@ let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
self = rec { self = rec {
moduleList = builtins.attrNames (builtins.readDir ./${modulesFolder});
mergedModules = mergeModules ( mergedModules = mergeModules (
builtins.listToAttrs ( builtins.listToAttrs (map (fn: (import ./${modulesFolder}/${fn} { })) (moduleList))
map (fn: {
name = fn;
value = import ./${modulesFolder}/${fn} { };
}) (builtins.attrNames (builtins.readDir ./${modulesFolder}))
)
); );
generateHostname = generateHostname =
@@ -192,12 +188,10 @@ let
mergeModules = mergeModules =
modules: modules:
let let
mergedModules = builtins.attrValues ( mergedModules = builtins.mapAttrs (name: module: {
builtins.mapAttrs (name: module: {
nixos = if builtins.hasAttr "nixos" module then [ module.nixos ] else [ ]; nixos = if builtins.hasAttr "nixos" module then [ module.nixos ] else [ ];
home = if builtins.hasAttr "home" module then [ module.home ] else [ ]; home = if builtins.hasAttr "home" module then [ module.home ] else [ ];
}) modules }) modules;
);
in in
deepMerge mergedModules; deepMerge mergedModules;
}; };