Simplify input arguments to outputs

This commit is contained in:
Alexander Heldt
2023-08-27 20:36:00 +02:00
parent 10262f2a2d
commit 573cfb4ba5
2 changed files with 9 additions and 10 deletions

View File

@@ -18,18 +18,17 @@
};
};
outputs = { self, nixpkgs, nixpkgs2211, nixos-hardware, home-manager, agenix, ... }: {
outputs = { self, ... } @inputs : {
nixosConfigurations = {
pinwheel = let
system = "x86_64-linux";
in nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit system agenix; };
in inputs.nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs system; };
modules = [
./hosts/pinwheel/configuration.nix
agenix.nixosModules.default
nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen
home-manager.nixosModules.home-manager
inputs.agenix.nixosModules.default
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-10th-gen
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@@ -38,7 +37,7 @@
];
};
sombrero = nixpkgs2211.lib.nixosSystem {
sombrero = inputs.nixpkgs2211.lib.nixosSystem {
system = "aarch64-linux";
modules = [ ./hosts/sombrero/configuration.nix ];
};

View File

@@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ system, config, pkgs, agenix, ... }:
{ inputs, system, config, pkgs, ... }:
{
imports =
@@ -87,7 +87,7 @@
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
agenix.packages."${system}".default
inputs.agenix.packages."${system}".default
];
fonts.packages = with pkgs; [