From 8ac8de2593a9f5e3c160f95358b4db75d3a04640 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 11 Dec 2023 06:44:34 -0500 Subject: systems+seth: add inputs' to module.args; use flake for firefox addons --- systems/common.nix | 4 ++-- systems/default.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'systems') diff --git a/systems/common.nix b/systems/common.nix index b4dc782..3960495 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -2,7 +2,7 @@ inputs, self, }: let - hmSetup = { + hmSetup = {inputs', ...}: { imports = [ ../users/seth/system.nix ]; @@ -10,7 +10,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = {inherit inputs self;}; + extraSpecialArgs = {inherit inputs inputs' self;}; }; }; in { diff --git a/systems/default.nix b/systems/default.nix index 2f8c277..6f31339 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -1,8 +1,8 @@ { lib, + withSystem, inputs, self, - withSystem, ... }: let /* @@ -16,6 +16,7 @@ modules = args.modules ++ [./${name}]; specialArgs = { inherit inputs self; + inputs' = withSystem (args.system or "x86_64-linux") ({inputs', ...}: inputs'); secretsDir = ../secrets/${name}; }; } -- cgit v1.2.3