alex/nixos-configs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify input arguments to outputs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
flake.nix
View File

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

4
hosts/pinwheel/configuration.nix
View File

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