nix-rewrite-v2 #5

Merged
jahanson merged 8 commits from nix-rewrite-v2 into main 2024-03-06 21:04:02 -06:00
Showing only changes of commit 4fff6d07e4 - Show all commits

View file

@ -47,27 +47,18 @@
# inputs's parameter, making it convenient to use inside the function. # inputs's parameter, making it convenient to use inside the function.
outputs = { self, nixpkgs, home-manager, ... }@inputs: outputs = { self, nixpkgs, home-manager, ... }@inputs:
let let
inherit (self) outputs;
forAllSystems = nixpkgs.lib.genAttrs [ forAllSystems = nixpkgs.lib.genAttrs [
"aarch64-linux" # "aarch64-linux"
"x86_64-linux" "x86_64-linux"
]; ];
in in
{ {
hosts = import ./hosts.nix;
pkgs = forAllSystems (localSystem: import nixpkgs {
inherit localSystem;
config = {
allowUnfree = true;
allowAliases = true;
};
});
packages = forAllSystems (import ./packages inputs);
nixosConfigurations = { nixosConfigurations = {
"durincore" = nixpkgs.lib.nixosSystem { "durincore" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = inputs; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
# Import the configuration.nix here, so that the # Import the configuration.nix here, so that the
# old configuration file can still take effect. # old configuration file can still take effect.
@ -85,7 +76,7 @@
}; };
"este" = nixpkgs.lib.nixosSystem { "este" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = inputs; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
./nixos/este/configuration.nix ./nixos/este/configuration.nix
./nixos/common.nix ./nixos/common.nix
@ -99,7 +90,7 @@
}; };
"gandalf" = nixpkgs.lib.nixosSystem { "gandalf" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = inputs; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
./nixos/gandalf/configuration.nix ./nixos/gandalf/configuration.nix
./nixos/common.nix ./nixos/common.nix