overlay: cleanup file import & rename

6 files changed, 16 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index 092d573..22c6d5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -140,7 +140,7 @@
         inputs.pre-commit.flakeModule
 
         ./modules
-        ./overlays
+        ./overlay
         ./systems
         ./users
         ./dev.nix
diff --git a/overlays/btop.nix b/overlay/btop.nix
index b2a5b24..b2a5b24 100644
--- a/overlays/btop.nix
+++ b/overlay/btop.nix
diff --git a/overlay/default.nix b/overlay/default.nix
new file mode 100644
index 0000000..24e3420
--- /dev/null
+++ b/overlay/default.nix
@@ -0,0 +1,15 @@
+{
+  flake.overlays.default = final: prev:
+    prev.lib.composeManyExtensions
+    (
+      prev.lib.pipe ./. [
+        builtins.readDir
+        builtins.attrNames
+
+        (builtins.filter (n: n != "default.nix"))
+        (map (f: import ./${f}))
+      ]
+    )
+    final
+    prev;
+}
diff --git a/overlays/discord.nix b/overlay/discord.nix
index cb651cd..cb651cd 100644
--- a/overlays/discord.nix
+++ b/overlay/discord.nix
diff --git a/overlays/fish.nix b/overlay/fish.nix
index 4e7fffc..4e7fffc 100644
--- a/overlays/fish.nix
+++ b/overlay/fish.nix
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100644
index 36986a5..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  flake.overlays.default = final: prev:
-    prev.lib.composeManyExtensions
-    (
-      let
-        files = prev.lib.filterAttrs (n: _: n != "default.nix") (builtins.readDir ./.);
-      in
-        prev.lib.mapAttrsToList (n: _: import ./${n}) files
-    )
-    final
-    prev;
-}