imxyy1soope1/nixos-dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Activity

refactor: pkgs

Browse Source
This commit is contained in:
imxyy_soope_
2025-12-27 14:34:50 +08:00
parent e112f5f21d
commit 4ab322f08d
5 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/umport.nix
View File

@@ -28,20 +28,17 @@ let
|| extraExcludePredicate path;
in
unique (
(filter
(file: pathIsRegularFile file && hasSuffix ".nix" (builtins.toString file) && !isExcluded file)
(
concatMap (
path:
if recursive then
toList path
else
mapAttrsToList (
name: type: path + (if type == "directory" then "/${name}/default.nix" else "/${name}")
) (builtins.readDir path)
) (unique (if path == null then paths else [ path ] ++ paths))
)
)
(filter (file: pathIsRegularFile file && hasSuffix ".nix" (toString file) && !isExcluded file) (
concatMap (
path:
if recursive then
toList path
else
mapAttrsToList (
name: type: path + (if type == "directory" then "/${name}/default.nix" else "/${name}")
) (builtins.readDir path)
) (unique (if path == null then paths else [ path ] ++ paths))
))
++ (if recursive then concatMap (path: toList path) (unique include) else unique include)
);
in