From 068be3f5bf3eb568edf5136b6d4ed0e1b9805dd2 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 30 Jul 2020 23:32:53 -0600 Subject: [PATCH] lint: remove `//`, replace with `recursiveUpdate` --- flake.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2f6d10d..e55bd69 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ let inherit (builtins) attrNames attrValues readDir; inherit (nixpkgs) lib; - inherit (lib) removeSuffix; + inherit (lib) removeSuffix recursiveUpdate; inherit (utils) pathsToImportedAttrs; utils = import ./lib/utils.nix { inherit lib; }; @@ -29,7 +29,11 @@ in { 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; }; @@ -60,6 +64,8 @@ profilesAttrs = { profiles = pathsToImportedAttrs profilesList; }; in - cachixAttrs // modulesAttrs // profilesAttrs; + recursiveUpdate + (recursiveUpdate cachixAttrs modulesAttrs) + profilesAttrs; }; }