From dccea7f8c63fb2da54e23594b75e7612f20547da Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Thu, 6 Feb 2025 15:20:32 +0100 Subject: [PATCH] hosts: import hjem everywhere This fixes evaluation issues when hjem is not a known option. --- hosts/anastacia/default.nix | 4 +--- hosts/default.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hosts/anastacia/default.nix b/hosts/anastacia/default.nix index 3991df9..ab891d6 100644 --- a/hosts/anastacia/default.nix +++ b/hosts/anastacia/default.nix @@ -1,6 +1,4 @@ -{inputs, ...}: let - system = "${inputs.self}/system"; -in { +{inputs, ...}: { imports = [ ./hardware-configuration.nix ./networking.nix # generated at runtime by nixos-infect diff --git a/hosts/default.nix b/hosts/default.nix index e6a1bba..ec69743 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -3,22 +3,23 @@ mkSystem = args: inputs.nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs lib';}; - modules = (args.modules or []) ++ [../modules]; + modules = + (args.modules or []) + ++ [ + ../modules + inputs.hjem.nixosModules.default + ]; }; in { vamos = mkSystem { modules = [ ./vamos inputs.nixos-hardware.nixosModules.framework-13-7040-amd - inputs.hjem.nixosModules.default ]; }; solaire = mkSystem { - modules = [ - ./solaire - inputs.hjem.nixosModules.default - ]; + modules = [./solaire]; }; anastacia = mkSystem {