From 4fff6d07e4b56e9d717bf78e68f3025c7b19d32c Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 6 Mar 2024 09:48:10 -0600 Subject: [PATCH] Removing unused modules and adding outputs into specialArgs for deeper configuration. --- flake.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 186ef2a..02885fb 100644 --- a/flake.nix +++ b/flake.nix @@ -45,29 +45,20 @@ # The `@` syntax here is used to alias the attribute set of the # inputs's parameter, making it convenient to use inside the function. - outputs = { self, nixpkgs, home-manager, ... }@inputs: + outputs = { self, nixpkgs, home-manager, ... }@inputs: let + inherit (self) outputs; forAllSystems = nixpkgs.lib.genAttrs [ - "aarch64-linux" + # "aarch64-linux" "x86_64-linux" ]; in { - hosts = import ./hosts.nix; - pkgs = forAllSystems (localSystem: import nixpkgs { - inherit localSystem; - config = { - allowUnfree = true; - allowAliases = true; - }; - }); - - packages = forAllSystems (import ./packages inputs); - + nixosConfigurations = { "durincore" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = {inherit inputs outputs;}; modules = [ # Import the configuration.nix here, so that the # old configuration file can still take effect. @@ -85,7 +76,7 @@ }; "este" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = {inherit inputs outputs;}; modules = [ ./nixos/este/configuration.nix ./nixos/common.nix @@ -99,7 +90,7 @@ }; "gandalf" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = {inherit inputs outputs;}; modules = [ ./nixos/gandalf/configuration.nix ./nixos/common.nix