From 0eadd3469b90179ddcd219b25d572a5dfe4f49c9 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 6 Jun 2023 05:03:23 -0400
Subject: [PATCH] meta: Use separate directories for each overlay

---
 overlays/alejandra/default.nix                |  9 +++++++
 .../remove-ads.patch}                         |  0
 overlays/default.nix                          | 27 +++----------------
 overlays/joshuto/default.nix                  | 21 +++++++++++++++
 4 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 overlays/alejandra/default.nix
 rename overlays/{alejandra-remove-ads.patch => alejandra/remove-ads.patch} (100%)
 create mode 100644 overlays/joshuto/default.nix

diff --git a/overlays/alejandra/default.nix b/overlays/alejandra/default.nix
new file mode 100644
index 00000000..269107e9
--- /dev/null
+++ b/overlays/alejandra/default.nix
@@ -0,0 +1,9 @@
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      alejandra = prev.alejandra.overrideAttrs (old: {
+        patches = (old.patches or []) ++ [./remove-ads.patch];
+      });
+    })
+  ];
+}
diff --git a/overlays/alejandra-remove-ads.patch b/overlays/alejandra/remove-ads.patch
similarity index 100%
rename from overlays/alejandra-remove-ads.patch
rename to overlays/alejandra/remove-ads.patch
diff --git a/overlays/default.nix b/overlays/default.nix
index 9f307ef7..7e81b10b 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,25 +1,6 @@
-{lib, ...}: {
-  nixpkgs.overlays = [
-    (final: prev: {
-      joshuto = prev.joshuto.overrideAttrs (oldAttrs: rec {
-        version = "493af3185092036cbbae81ae620b101f66cf4e9a";
-        src = final.fetchFromGitHub {
-          owner = "kamiyaa";
-          repo = "joshuto";
-          rev = "493af3185092036cbbae81ae620b101f66cf4e9a";
-          sha256 = "sha256-jLlDMV03eFWDB1D6pFEq2MFAfoVwFTy8ZpweS9syDB0=";
-        };
-
-        cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
-          name = "joshuto.tar.gz";
-          inherit src;
-          outputHash = "sha256-cDy7sccuZj+RNjaDGjqczGl//zgmMAifjv/ZMEO/yyY=";
-        });
-      });
-
-      alejandra = prev.alejandra.overrideAttrs (old: {
-        patches = (old.patches or []) ++ [./alejandra-remove-ads.patch];
-      });
-    })
+{
+  imports = [
+    ./alejandra
+    ./joshuto
   ];
 }
diff --git a/overlays/joshuto/default.nix b/overlays/joshuto/default.nix
new file mode 100644
index 00000000..a18dc419
--- /dev/null
+++ b/overlays/joshuto/default.nix
@@ -0,0 +1,21 @@
+{lib, ...}: {
+  nixpkgs.overlays = [
+    (final: prev: {
+      joshuto = prev.joshuto.overrideAttrs (oldAttrs: rec {
+        version = "493af3185092036cbbae81ae620b101f66cf4e9a";
+        src = final.fetchFromGitHub {
+          owner = "kamiyaa";
+          repo = "joshuto";
+          rev = "493af3185092036cbbae81ae620b101f66cf4e9a";
+          sha256 = "sha256-jLlDMV03eFWDB1D6pFEq2MFAfoVwFTy8ZpweS9syDB0=";
+        };
+
+        cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
+          name = "joshuto.tar.gz";
+          inherit src;
+          outputHash = "sha256-cDy7sccuZj+RNjaDGjqczGl//zgmMAifjv/ZMEO/yyY=";
+        });
+      });
+    })
+  ];
+}