From 000915a37511c7901e0d45278aa66cf6644ae680 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Thu, 23 Feb 2023 18:58:47 -0500 Subject: [PATCH] fixed duplicate system in nix.nix --- modules/nix.nix | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/modules/nix.nix b/modules/nix.nix index 9930738..960752b 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -12,26 +12,24 @@ nix = { # package = nix.packages.${pkgs.system}.nix; #automatically get registry from input flakes - registry = - ( - lib.attrsets.mapAttrs ( - _: value: { - flake = value; - } - ) ( - lib.attrsets.filterAttrs ( - _: value: ( - !(lib.attrsets.hasAttrByPath ["flake"] value) || value.flake == false - ) - ) - inputs - ) - // { - nixpkgs.flake = unstable; - system.flake = self; + registry = ( + lib.attrsets.mapAttrs ( + _: value: { + flake = value; } + ) ( + lib.attrsets.filterAttrs ( + _: value: ( + !(lib.attrsets.hasAttrByPath ["flake"] value) || value.flake == false + ) + ) + inputs ) - // {system = {flake = self;};}; + // { + nixpkgs.flake = unstable; + system.flake = self; + } + ); #automatically add registry entries to nixPath nixPath = (lib.mapAttrsToList (name: value: name + "=" + value) inputs) ++ ["system=${self}" "nixpkgs=${unstable}"]; settings = {