overlay rework

This commit is contained in:
2025-09-19 07:29:56 +00:00
parent 34a13921a3
commit ac55a76caf
3 changed files with 24 additions and 10 deletions

View File

@@ -36,6 +36,7 @@
user = constants.user;
darwinHosts = builtins.attrNames (builtins.readDir ./hosts/darwin);
nixosHosts = builtins.attrNames (builtins.readDir ./hosts/nixos);
overlays = import ./overlays {inherit inputs;};
in {
systems = [
"x86_64-linux"
@@ -55,11 +56,7 @@
inputs.home-manager.darwinModules.home-manager
inputs.nix-homebrew.darwinModules.nix-homebrew
{
nixpkgs.overlays = [
(final: prev: {
zjstatus = inputs.zjstatus.packages.${prev.system}.default;
})
];
nixpkgs.overlays = overlays;
nix-homebrew = {
inherit user;
@@ -88,11 +85,7 @@
modules = [
inputs.home-manager.nixosModules.home-manager
{
nixpkgs.overlays = [
(final: prev: {
zjstatus = inputs.zjstatus.packages.${prev.system}.default;
})
];
nixpkgs.overlays = overlays;
}
./hosts/nixos/${hostname}
];
@@ -139,6 +132,7 @@
appNames
);
};
flake.overlays = overlays;
}
);
}