From 338bf19784c2e14f7dde26c742b8ff30670e709e Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 16 Jun 2023 12:46:04 -0400
Subject: [PATCH] meta: Flatten overlays directory

---
 overlays/{alejandra/default.nix => alejandra.nix}      |  2 +-
 overlays/default.nix                                   | 10 +++++-----
 overlays/{joshuto/default.nix => joshuto.nix}          |  0
 overlays/{kitty/default.nix => kitty.nix}              |  2 +-
 overlays/{rofi/default.nix => rofi.nix}                |  0
 overlays/{waybar/default.nix => waybar.nix}            |  0
 .../alejandra-remove-ads.patch                         |  0
 .../kitty-fix-duplicate-lines.patch                    |  0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename overlays/{alejandra/default.nix => alejandra.nix} (59%)
 rename overlays/{joshuto/default.nix => joshuto.nix} (100%)
 rename overlays/{kitty/default.nix => kitty.nix} (56%)
 rename overlays/{rofi/default.nix => rofi.nix} (100%)
 rename overlays/{waybar/default.nix => waybar.nix} (100%)
 rename overlays/alejandra/remove-ads.patch => patches/alejandra-remove-ads.patch (100%)
 rename overlays/kitty/fix-duplicate-lines.patch => patches/kitty-fix-duplicate-lines.patch (100%)

diff --git a/overlays/alejandra/default.nix b/overlays/alejandra.nix
similarity index 59%
rename from overlays/alejandra/default.nix
rename to overlays/alejandra.nix
index d4fff40..cc008b0 100644
--- a/overlays/alejandra/default.nix
+++ b/overlays/alejandra.nix
@@ -2,7 +2,7 @@
   nixpkgs.overlays = [
     (final: prev: {
       alejandra = prev.alejandra.overrideAttrs (old: {
-        patches = (old.patches or [ ]) ++ [ ./remove-ads.patch ];
+        patches = (old.patches or [ ]) ++ [ ../patches/alejandra-remove-ads.patch ];
       });
     })
   ];
diff --git a/overlays/default.nix b/overlays/default.nix
index 77c60ce..66da0d7 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,9 +1,9 @@
 {
   imports = [
-    ./alejandra
-    ./joshuto
-    ./kitty
-    ./rofi
-    ./waybar
+    ./alejandra.nix
+    ./joshuto.nix
+    ./kitty.nix
+    ./rofi.nix
+    ./waybar.nix
   ];
 }
diff --git a/overlays/joshuto/default.nix b/overlays/joshuto.nix
similarity index 100%
rename from overlays/joshuto/default.nix
rename to overlays/joshuto.nix
diff --git a/overlays/kitty/default.nix b/overlays/kitty.nix
similarity index 56%
rename from overlays/kitty/default.nix
rename to overlays/kitty.nix
index 68498d1..ee84588 100644
--- a/overlays/kitty/default.nix
+++ b/overlays/kitty.nix
@@ -2,7 +2,7 @@
   nixpkgs.overlays = [
     (final: prev: {
       kitty = prev.kitty.overrideAttrs (old: {
-        patches = (old.patches or [ ]) ++ [ ./fix-duplicate-lines.patch ];
+        patches = (old.patches or [ ]) ++ [ ../patches/kitty-fix-duplicate-lines.patch ];
       });
     })
   ];
diff --git a/overlays/rofi/default.nix b/overlays/rofi.nix
similarity index 100%
rename from overlays/rofi/default.nix
rename to overlays/rofi.nix
diff --git a/overlays/waybar/default.nix b/overlays/waybar.nix
similarity index 100%
rename from overlays/waybar/default.nix
rename to overlays/waybar.nix
diff --git a/overlays/alejandra/remove-ads.patch b/patches/alejandra-remove-ads.patch
similarity index 100%
rename from overlays/alejandra/remove-ads.patch
rename to patches/alejandra-remove-ads.patch
diff --git a/overlays/kitty/fix-duplicate-lines.patch b/patches/kitty-fix-duplicate-lines.patch
similarity index 100%
rename from overlays/kitty/fix-duplicate-lines.patch
rename to patches/kitty-fix-duplicate-lines.patch