hosts: import hjem everywhere

This fixes evaluation issues when hjem is not a known option.
This commit is contained in:
Anthony Rodriguez 2025-02-06 15:20:32 +01:00
parent d9bcae7d25
commit dccea7f8c6
Signed by: nezia
SSH key fingerprint: SHA256:Ihfpl0rUpqDevYqnzSR34OYfVLbDNkBiUjs3CpX4ykA
2 changed files with 8 additions and 9 deletions

View file

@ -1,6 +1,4 @@
{inputs, ...}: let {inputs, ...}: {
system = "${inputs.self}/system";
in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./networking.nix # generated at runtime by nixos-infect ./networking.nix # generated at runtime by nixos-infect

View file

@ -3,22 +3,23 @@
mkSystem = args: mkSystem = args:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs lib';}; specialArgs = {inherit inputs lib';};
modules = (args.modules or []) ++ [../modules]; modules =
(args.modules or [])
++ [
../modules
inputs.hjem.nixosModules.default
];
}; };
in { in {
vamos = mkSystem { vamos = mkSystem {
modules = [ modules = [
./vamos ./vamos
inputs.nixos-hardware.nixosModules.framework-13-7040-amd inputs.nixos-hardware.nixosModules.framework-13-7040-amd
inputs.hjem.nixosModules.default
]; ];
}; };
solaire = mkSystem { solaire = mkSystem {
modules = [ modules = [./solaire];
./solaire
inputs.hjem.nixosModules.default
];
}; };
anastacia = mkSystem { anastacia = mkSystem {