reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(util): clean up

Browse source 
Use `lib.path.append`
`and` after `map` -> `lib.all`
Indentation
This commit is contained in:
reo101 2023-09-06 20:53:03 +03:00
parent a0494b4d61
commit 50549a4c1e
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
1 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
util/default.nix
View file

@ -16,17 +16,17 @@ rec {
(file: type: (file: type:
if type == "directory" if type == "directory"
then recurseDir "${dir}/${file}" then recurseDir "${dir}/${file}"
else type else type)
)
(builtins.readDir dir); (builtins.readDir dir);
allSatisfy = predicate: attrs: attrset: allSatisfy = predicate: attrs: attrset:
and lib.all
(builtins.map (attr:
(attr: and [
builtins.hasAttr attr attrset && (builtins.hasAttr attr attrset)
predicate (builtins.getAttr attr attrset)) (predicate (builtins.getAttr attr attrset))
attrs); ])
attrs;
# NOTE: Implying last argument is the output of `recurseDir` # NOTE: Implying last argument is the output of `recurseDir`
hasFiles = allSatisfy (eq "regular"); hasFiles = allSatisfy (eq "regular");
@ -57,7 +57,7 @@ rec {
(lib.mapAttrs' (lib.mapAttrs'
(name: type: (name: type:
let let
moduleDir = baseDir + "/${name}"; moduleDir = lib.path.append baseDir "${name}";
in in
if and [ if and [
(type == "directory") (type == "directory")
@ -116,7 +116,7 @@ rec {
inherit system; inherit system;
modules = [ modules = [
(root + "/configuration.nix") (lib.path.append root "configuration.nix")
inputs.nur.nixosModules.nur inputs.nur.nixosModules.nur
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
@ -125,7 +125,7 @@ rec {
useUserPackages = true; useUserPackages = true;
users = lib.attrsets.genAttrs users = lib.attrsets.genAttrs
users users
(user: import (root + "/home/${user}.nix")); (user: import (lib.path.append root "home/${user}.nix"));
sharedModules = builtins.attrValues homeManagerModules; sharedModules = builtins.attrValues homeManagerModules;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs; inherit inputs outputs;
@ -153,11 +153,11 @@ rec {
}; };
modules = [ modules = [
(root + "/configuration.nix") (lib.path.append root "configuration.nix")
{ nix.registry.nixpkgs.flake = nixpkgs; } { nix.registry.nixpkgs.flake = nixpkgs; }
{ {
home-manager = { home-manager = {
config = (root + "/home.nix"); config = (lib.path.append root "home.nix");
backupFileExtension = "hm-bak"; backupFileExtension = "hm-bak";
useGlobalPkgs = false; useGlobalPkgs = false;
useUserPackages = true; useUserPackages = true;
@ -183,7 +183,7 @@ rec {
inherit system; inherit system;
modules = [ modules = [
(root + "/configuration.nix") (lib.path.append root "configuration.nix")
inputs.home-manager.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager
{ {
home-manager = { home-manager = {
@ -191,7 +191,7 @@ rec {
useUserPackages = true; useUserPackages = true;
users = lib.attrsets.genAttrs users = lib.attrsets.genAttrs
users users
(user: import (root + "/home/${user}.nix")); (user: import (lib.path.append root "home/${user}.nix"));
sharedModules = builtins.attrValues homeManagerModules; sharedModules = builtins.attrValues homeManagerModules;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs; inherit inputs outputs;
@ -211,7 +211,7 @@ rec {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
modules = [ modules = [
(root + "/home.nix") (lib.path.append root "home.nix")
] ++ (builtins.attrValues homeManagerModules); ] ++ (builtins.attrValues homeManagerModules);
extraSpecialArgs = { extraSpecialArgs = {
@ -228,15 +228,15 @@ rec {
(builtins.attrValues (builtins.attrValues
(builtins.mapAttrs (builtins.mapAttrs
(system: hosts: (system: hosts:
lib.filterAttrs lib.filterAttrs
(host: config:
config != null)
(builtins.mapAttrs
(host: config: (host: config:
if (pred system host config) config != null)
then mkHost system host config (builtins.mapAttrs
else null) (host: config:
hosts)) if (pred system host config)
then mkHost system host config
else null)
hosts))
machines)); machines));
# Configurations # Configurations
@ -248,9 +248,9 @@ rec {
(hasFiles (hasFiles
[ "configuration.nix" ] [ "configuration.nix" ]
config) config)
(hasDirectories # (hasDirectories
[ "home" ] # [ "home" ]
config) # config)
]) ])
(system: host: config: (system: host: config:
mkNixosHost mkNixosHost