RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 11:37:44 +00:00
Code Issues Activity

Move collect to inside lib

Browse source
This commit is contained in:
RGBCube 2025-01-24 23:50:51 +03:00
parent 052768f9db
commit 24f825efc3
Signed by: RGBCube
SSH key fingerprint: SHA256:CzqbPcfwt+GxFYNnFVCqoN5Itn4YFrshg1TrnACpA5M
3 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/default.nix
View file

@ -1,5 +1,6 @@
inputs: self: super: let inputs: self: super: let
option = import ./option.nix inputs self super; filesystem = import ./filesystem.nix inputs self super;
system = import ./system.nix inputs self super; option = import ./option.nix inputs self super;
values = import ./values.nix inputs self super; system = import ./system.nix inputs self super;
in option // system // values values = import ./values.nix inputs self super;
in filesystem // option // system // values

7
lib/filesystem.nix Normal file
View file

@ -0,0 +1,7 @@
_: self: super: let
inherit (self) filter hasSuffix;
inherit (self.filesystem) listFilesRecursive;
in {
collect = path: listFilesRecursive path
|> filter (hasSuffix ".nix");
}

31
lib/system.nix
View file

@ -1,12 +1,8 @@
inputs: self: super: let inputs: self: super: let
inherit (self) attrValues filter getAttrFromPath hasAttrByPath hasSuffix; inherit (self) attrValues filter getAttrFromPath hasAttrByPath collect;
inherit (self.filesystem) listFilesRecursive;
collect = path: listFilesRecursive path
|> filter (hasSuffix ".nix");
commonModules = collect ../modules/common; commonModules = collect ../modules/common;
nixosModules = collect ../modules/nixos; nixosModules = collect ../modules/linux;
darwinModules = collect ../modules/darwin; darwinModules = collect ../modules/darwin;
collectInputs = let collectInputs = let
@ -20,34 +16,33 @@ inputs: self: super: let
inputOverlays = collectInputs [ "overlays" "default" ]; inputOverlays = collectInputs [ "overlays" "default" ];
overlayModule = { nixpkgs.overlays = inputOverlays; }; overlayModule = { nixpkgs.overlays = inputOverlays; };
specialArgs = inputs // {
inherit inputs;
keys = import ../keys.nix;
lib = self;
};
in { in {
nixosSystem = module: super.nixosSystem { nixosSystem = module: super.nixosSystem {
inherit specialArgs;
modules = [ modules = [
module module
overlayModule overlayModule
] ++ commonModules ] ++ commonModules
++ nixosModules ++ nixosModules
++ inputNixosModules; ++ inputNixosModules;
specialArgs = inputs // {
inherit inputs;
lib = self;
};
}; };
darwinSystem = module: super.darwinSystem { darwinSystem = module: super.darwinSystem {
inherit specialArgs;
modules = [ modules = [
module module
overlayModule overlayModule
] ++ commonModules ] ++ commonModules
++ darwinModules ++ darwinModules
++ inputDarwinModules; ++ inputDarwinModules;
specialArgs = inputs // {
inherit inputs;
lib = self;
};
}; };
} }