lint: remove //
, replace with recursiveUpdate
This commit is contained in:
parent
10171142e5
commit
068be3f5bf
12
flake.nix
12
flake.nix
@ -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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user