From 7dbd900843153d6cc11d939d640a1feb53d346be Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Sat, 13 Jul 2024 09:55:05 -0400
Subject: [PATCH] Flake: Reorganize overlays

---
 flake.nix            | 13 +++++++------
 overlays/default.nix |  5 +++++
 2 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 overlays/default.nix

diff --git a/flake.nix b/flake.nix
index 0c6cb0d..2ba8c58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,7 @@
   };
   
   outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
-    hydraGitea = import ./overlays/hydra.nix;
-    nvidiaContainer = import ./overlays/nvidiacontainer.nix nixpkgs;
-    me-emacs-overlay = me-emacs.overlays.default;
+    overlays = import ./overlays/default.nix attrs;
 
     # Configuration for `nixpkgs`
     nixpkgsConfig = {
@@ -30,7 +28,10 @@
         modules =
           [
             ({ config, pkgs, ... }: {
-              nixpkgs.overlays = [ hydraGitea nvidiaContainer ];
+              nixpkgs.overlays = [
+                overlays.hydra
+                overlays.nvidiaContainer
+              ];
             })
             ./machines/hippocampus/configuration.nix
             sops-nix.nixosModules.sops
@@ -42,7 +43,7 @@
         modules =
           [
             ({ config, pkgs, ... }: {
-              nixpkgs.overlays = [ me-emacs-overlay ];
+              nixpkgs.overlays = [ overlays.emacs ];
             })
             ./machines/universedesktop/configuration.nix
             sops-nix.nixosModules.sops
@@ -57,7 +58,7 @@
       modules = [
         ./machines/universeair/configuration.nix
         ({ config, pkgs, ... }: {
-          nixpkgs.overlays = [ me-emacs-overlay ];
+          nixpkgs.overlays = [ overlays.emacs ];
         })
         home-manager.darwinModules.home-manager
         {
diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 0000000..9039639
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,5 @@
+inputs: {
+  hydra = import ./hydra.nix;
+  nvidiaContainer = import ./nvidiacontainer.nix inputs.nixpkgs;
+  emacs = inputs.me-emacs.overlays.default;
+}