From 475017cf874a5612aa1508b639ac54076077cd0e Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Wed, 20 Nov 2024 01:15:44 -0500 Subject: [PATCH] fix: use `specialArgs` to prevent infinite loop The `_module.args` option can't be used to pass modules to import, since it can only be used during the config phase, not the import phase. --- aether/config.nix | 6 +++--- flake.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aether/config.nix b/aether/config.nix index 8cdfed0..b40a4a1 100644 --- a/aether/config.nix +++ b/aether/config.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, self, ... }: +{ config, lib, pkgs, aether, ... }: { networking.hostName = "toki-aether"; time.timeZone = "America/New_York"; @@ -23,8 +23,8 @@ # Aether modules imports = [ - self.nixosModules.aether - self.nixosModules.deploy-rpi5 + aether.aether + aether.deploy-rpi5 ]; aether.domain = "tokinanpa.dev"; diff --git a/flake.nix b/flake.nix index 95c6cb0..edd65c2 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,8 @@ outputs = inputs@{ self, nixpkgs, agenix, rpi5-kernel, ... }: nixosConfigurations."toki-aether" = nixpkgs.lib.nixosSystem { + specialArgs.aether = self.nixosModules; modules = [ - { _module.args = inputs; } agenix.nixosModules.default ./aether/hardware-configuration.nix ./aether/config.nix