gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up lib and modules/misc

Browse source
This commit is contained in:
Gerg-L 2023-06-26 22:13:41 -04:00
parent f2974e6b13
commit da8e226c3a
7 changed files with 55 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/default.nix
View file

@ -5,29 +5,31 @@ inputs @ {
}: let
inherit (unstable) lib;
listNixFilesRecursive = path:
builtins.filter (lib.hasSuffix "nix")
(lib.filesystem.listFilesRecursive path);
importAll = path:
map
(module: (import module inputs))
(
builtins.filter (lib.hasSuffix ".nix")
(lib.filesystem.listFilesRecursive path)
);
(listNixFilesRecursive path);
mkModules = path:
lib.listToAttrs (
map (
name: {
name = lib.removePrefix (toString path + "/") (lib.removeSuffix ".nix" (toString name));
name = lib.pipe name [
toString
(lib.removePrefix "${path}/")
(lib.removeSuffix ".nix")
];
value = import name inputs;
}
)
(
builtins.filter (lib.hasSuffix ".nix")
(lib.filesystem.listFilesRecursive path)
)
(listNixFilesRecursive path)
);
in {
inherit importAll mkModules;
inherit importAll mkModules listNixFilesRecursive;
withSystem = f:
lib.fold lib.recursiveUpdate {}
@ -39,12 +41,13 @@ in {
lib.nixosSystem {
inherit system;
modules =
builtins.attrValues self.nixosModules ++ importAll (self + "/hosts/" + name);
builtins.attrValues self.nixosModules
++ importAll "${self}/hosts/${name}";
}
);
mkDisko = names:
lib.genAttrs names (
name: (import (self + "/hosts/" + name + "/disko.nix") inputs)
name: (import "${self}/hosts/${name}/disko.nix" inputs)
);
mkPkgs = pkgs: path:
@ -53,9 +56,6 @@ in {
name = lib.removeSuffix ".nix" (builtins.baseNameOf module);
value = pkgs.callPackage module {};
})
(
builtins.filter (lib.hasSuffix ".nix")
(lib.filesystem.listFilesRecursive path)
)
(listNixFilesRecursive path)
);
}