pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

lint: remove //, replace with recursiveUpdate

Browse source
This commit is contained in:
Timothy DeHerrera 2020-07-30 23:32:53 -06:00
parent 10171142e5
commit 068be3f5bf
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -9,7 +9,7 @@
let let
inherit (builtins) attrNames attrValues readDir; inherit (builtins) attrNames attrValues readDir;
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit (lib) removeSuffix; inherit (lib) removeSuffix recursiveUpdate;
inherit (utils) pathsToImportedAttrs; inherit (utils) pathsToImportedAttrs;
utils = import ./lib/utils.nix { inherit lib; }; utils = import ./lib/utils.nix { inherit lib; };
@ -29,7 +29,11 @@
in in
{ {
nixosConfigurations = nixosConfigurations =
import ./hosts (inputs // { inherit system pkgs unstablePkgs utils; }); import ./hosts (recursiveUpdate inputs {
inherit system pkgs
unstablePkgs utils;
}
);
devShell."${system}" = import ./shell.nix { inherit pkgs; }; devShell."${system}" = import ./shell.nix { inherit pkgs; };
@ -60,6 +64,8 @@
profilesAttrs = { profiles = pathsToImportedAttrs profilesList; }; profilesAttrs = { profiles = pathsToImportedAttrs profilesList; };
in in
cachixAttrs // modulesAttrs // profilesAttrs; recursiveUpdate
(recursiveUpdate cachixAttrs modulesAttrs)
profilesAttrs;
}; };
} }