Flake: Reorganize overlays

This commit is contained in:
2024-07-13 09:55:05 -04:00
parent 6d2e57d22a
commit 7dbd900843
2 changed files with 12 additions and 6 deletions

View File

@@ -11,9 +11,7 @@
}; };
outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
hydraGitea = import ./overlays/hydra.nix; overlays = import ./overlays/default.nix attrs;
nvidiaContainer = import ./overlays/nvidiacontainer.nix nixpkgs;
me-emacs-overlay = me-emacs.overlays.default;
# Configuration for `nixpkgs` # Configuration for `nixpkgs`
nixpkgsConfig = { nixpkgsConfig = {
@@ -30,7 +28,10 @@
modules = modules =
[ [
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ hydraGitea nvidiaContainer ]; nixpkgs.overlays = [
overlays.hydra
overlays.nvidiaContainer
];
}) })
./machines/hippocampus/configuration.nix ./machines/hippocampus/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
@@ -42,7 +43,7 @@
modules = modules =
[ [
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ me-emacs-overlay ]; nixpkgs.overlays = [ overlays.emacs ];
}) })
./machines/universedesktop/configuration.nix ./machines/universedesktop/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
@@ -57,7 +58,7 @@
modules = [ modules = [
./machines/universeair/configuration.nix ./machines/universeair/configuration.nix
({ config, pkgs, ... }: { ({ config, pkgs, ... }: {
nixpkgs.overlays = [ me-emacs-overlay ]; nixpkgs.overlays = [ overlays.emacs ];
}) })
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {

5
overlays/default.nix Normal file
View File

@@ -0,0 +1,5 @@
inputs: {
hydra = import ./hydra.nix;
nvidiaContainer = import ./nvidiacontainer.nix inputs.nixpkgs;
emacs = inputs.me-emacs.overlays.default;
}