michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: do not merge modules incorrectly

Browse Source
This commit is contained in:
Michael Thomas 2024-06-16 15:07:20 -04:00
parent b8efbc8f7d
commit 9059e76b26
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.nix
View File

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