fix: do not merge modules incorrectly

This commit is contained in:
Michael Thomas 2024-06-16 15:07:20 -04:00
parent b8efbc8f7d
commit 9059e76b26

View File

@ -91,20 +91,22 @@
};
nixosConfigurations = let
homeModule =
baseHomeModule
// {
home-manager.users.michael = import ./user/environments/nixos/home.nix;
};
fullNixOSModules =
defaultModules
++ [
baseHomeModule
{
home-manager.users.michael = import ./user/environments/nixos/home.nix;
}
];
in {
kitchen = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
fullNixOSModules
++ [
./modules/common.nix
./modules/containers.nix
homeModule
./machines/kitchen/configuration.nix
];
@ -114,12 +116,11 @@
thinkcentre = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
fullNixOSModules
++ [
./modules/common.nix
./modules/hyprland.nix
./modules/containers.nix
homeModule
./machines/thinkcentre/configuration.nix
agenix.nixosModules.default
@ -135,13 +136,12 @@
terra = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
fullNixOSModules
++ [
./modules/common.nix
./modules/hyprland.nix
./modules/containers.nix
./modules/applications/steam
homeModule
./machines/terra/configuration.nix
agenix.nixosModules.default