Flake: Easier Overlay Spec

This commit is contained in:
2024-07-13 10:44:39 -04:00
parent 7e79913d5e
commit a2ceaf2e2e

View File

@@ -14,6 +14,10 @@
overlays = import ./overlays/default.nix inputs; overlays = import ./overlays/default.nix inputs;
modules = import ./modules/default.nix inputs; modules = import ./modules/default.nix inputs;
overlays' = l: ({ config, pkgs, ... }: {
nixpkgs.overlays = l;
});
pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux"; pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux"; pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
@@ -36,12 +40,10 @@
nixos = nixosSystem' { nixos = nixosSystem' {
modules = modules =
[ [
({ config, pkgs, ... }: { (overlays' [
nixpkgs.overlays = [ overlays.hydra
overlays.hydra overlays.nvidiaContainer
overlays.nvidiaContainer ])
];
})
./machines/hippocampus/configuration.nix ./machines/hippocampus/configuration.nix
modules.sops modules.sops
]; ];
@@ -49,9 +51,9 @@
universedesktop = nixosSystem' { universedesktop = nixosSystem' {
modules = modules =
[ [
({ config, pkgs, ... }: { (overlays' [
nixpkgs.overlays = [ overlays.emacs ]; overlays.emacs
}) ])
./machines/universedesktop/configuration.nix ./machines/universedesktop/configuration.nix
modules.sops modules.sops
]; ];
@@ -60,9 +62,9 @@
darwinConfigurations."UniverseAir" = darwinSystem' { darwinConfigurations."UniverseAir" = darwinSystem' {
modules = [ modules = [
./machines/universeair/configuration.nix ./machines/universeair/configuration.nix
({ config, pkgs, ... }: { (overlays' [
nixpkgs.overlays = [ overlays.emacs ]; overlays.emacs
}) ])
modules.home-manager-darwin modules.home-manager-darwin
]; ];
}; };