From e34a9957e30732f6abd362ddba44c85903d19bb7 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 12 Jun 2024 23:32:18 +0000
Subject: [PATCH] hosts/common/nix: migrate the nixpkgs-overlay integration
 point (part 2)

---
 hosts/common/default.nix                  | 2 +-
 hosts/common/{nix/default.nix => nix.nix} | 2 +-
 hosts/common/nix/overlay/default.nix      | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename hosts/common/{nix/default.nix => nix.nix} (99%)
 delete mode 100644 hosts/common/nix/overlay/default.nix

diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 8391e7bf..98db641e 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -9,7 +9,7 @@
     ./ids.nix
     ./machine-id.nix
     ./net
-    ./nix
+    ./nix.nix
     ./persist.nix
     ./polyunfill.nix
     ./programs
diff --git a/hosts/common/nix/default.nix b/hosts/common/nix.nix
similarity index 99%
rename from hosts/common/nix/default.nix
rename to hosts/common/nix.nix
index 62e88459..5231efeb 100644
--- a/hosts/common/nix/default.nix
+++ b/hosts/common/nix.nix
@@ -70,7 +70,7 @@
   # ensure new deployments have a source of this repo with which they can bootstrap.
   # this however changes on every commit and can be slow to copy for e.g. `moby`.
   environment.etc."nixos" = lib.mkIf (config.sane.maxBuildCost >= 3) {
-    source = ../../..;
+    source = ../..;
   };
   environment.etc."nix/registry.json" = lib.mkIf (config.sane.maxBuildCost < 3) {
     enable = false;
diff --git a/hosts/common/nix/overlay/default.nix b/hosts/common/nix/overlay/default.nix
deleted file mode 100644
index b0c5b22a..00000000
--- a/hosts/common/nix/overlay/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-# XXX: NIX_PATH=...:nixpkgs-overlays=... will import every overlay in the directory
-# so we prefer to give it a directory with just this *one* overlay, otherwise it imports conflicting overlays
-# and gets stuck in a loop until it OOMs
-import ../../../../overlays/all.nix