From 437515004c23213895bf4f81f1421b2c1ee5047d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 5 Nov 2023 11:27:59 -0500
Subject: overlay: cleanup file import & rename

---
 flake.nix            |  2 +-
 overlay/btop.nix     | 14 ++++++++++++++
 overlay/default.nix  | 15 +++++++++++++++
 overlay/discord.nix  | 30 ++++++++++++++++++++++++++++++
 overlay/fish.nix     | 14 ++++++++++++++
 overlays/btop.nix    | 14 --------------
 overlays/default.nix | 12 ------------
 overlays/discord.nix | 30 ------------------------------
 overlays/fish.nix    | 14 --------------
 9 files changed, 74 insertions(+), 71 deletions(-)
 create mode 100644 overlay/btop.nix
 create mode 100644 overlay/default.nix
 create mode 100644 overlay/discord.nix
 create mode 100644 overlay/fish.nix
 delete mode 100644 overlays/btop.nix
 delete mode 100644 overlays/default.nix
 delete mode 100644 overlays/discord.nix
 delete mode 100644 overlays/fish.nix

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/overlay/btop.nix b/overlay/btop.nix
new file mode 100644
index 0000000..b2a5b24
--- /dev/null
+++ b/overlay/btop.nix
@@ -0,0 +1,14 @@
+_: prev: {
+  btop =
+    if prev.stdenv.isLinux
+    then
+      prev.symlinkJoin {
+        inherit (prev.btop) passthru;
+        name = "btop-nodesktop";
+        paths = [prev.btop];
+        postBuild = ''
+          rm $out/share/applications/btop.desktop
+        '';
+      }
+    else prev.btop;
+}
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/overlay/discord.nix b/overlay/discord.nix
new file mode 100644
index 0000000..cb651cd
--- /dev/null
+++ b/overlay/discord.nix
@@ -0,0 +1,30 @@
+_: prev: let
+  mkOverride = d: let
+    # TODO: re-enable openASAR when gnome wayland decorations work with it
+    d' = d; #.override {withOpenASAR = true;};
+    inherit (d') pname;
+
+    desktopName =
+      if pname == "discord-canary"
+      then "Discord Canary"
+      else "Discord";
+
+    flags = "--enable-gpu-rasterization --enable-zero-copy --enable-gpu-compositing --enable-native-gpu-memory-buffers --enable-oop-rasterization --enable-features=UseSkiaRenderer,WaylandWindowDecorations";
+
+    desktopItem = prev.makeDesktopItem {
+      name = pname;
+      exec = "${builtins.replaceStrings [" "] [""] desktopName} ${flags}";
+      icon = pname;
+      inherit desktopName;
+      genericName = d'.meta.description;
+      categories = ["Network" "InstantMessaging"];
+      mimeTypes = ["x-scheme-handler/discord"];
+    };
+  in
+    if prev.stdenv.isLinux
+    then d'.overrideAttrs (_: {inherit desktopItem;})
+    else d';
+in {
+  discord = mkOverride prev.discord;
+  discord-canary = mkOverride prev.discord-canary;
+}
diff --git a/overlay/fish.nix b/overlay/fish.nix
new file mode 100644
index 0000000..4e7fffc
--- /dev/null
+++ b/overlay/fish.nix
@@ -0,0 +1,14 @@
+_: prev: {
+  fish =
+    if prev.stdenv.isLinux
+    then
+      prev.symlinkJoin {
+        inherit (prev.fish) passthru;
+        name = "fish-nodesktop";
+        paths = [prev.fish];
+        postBuild = ''
+          rm $out/share/applications/fish.desktop
+        '';
+      }
+    else prev.fish;
+}
diff --git a/overlays/btop.nix b/overlays/btop.nix
deleted file mode 100644
index b2a5b24..0000000
--- a/overlays/btop.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-_: prev: {
-  btop =
-    if prev.stdenv.isLinux
-    then
-      prev.symlinkJoin {
-        inherit (prev.btop) passthru;
-        name = "btop-nodesktop";
-        paths = [prev.btop];
-        postBuild = ''
-          rm $out/share/applications/btop.desktop
-        '';
-      }
-    else prev.btop;
-}
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;
-}
diff --git a/overlays/discord.nix b/overlays/discord.nix
deleted file mode 100644
index cb651cd..0000000
--- a/overlays/discord.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-_: prev: let
-  mkOverride = d: let
-    # TODO: re-enable openASAR when gnome wayland decorations work with it
-    d' = d; #.override {withOpenASAR = true;};
-    inherit (d') pname;
-
-    desktopName =
-      if pname == "discord-canary"
-      then "Discord Canary"
-      else "Discord";
-
-    flags = "--enable-gpu-rasterization --enable-zero-copy --enable-gpu-compositing --enable-native-gpu-memory-buffers --enable-oop-rasterization --enable-features=UseSkiaRenderer,WaylandWindowDecorations";
-
-    desktopItem = prev.makeDesktopItem {
-      name = pname;
-      exec = "${builtins.replaceStrings [" "] [""] desktopName} ${flags}";
-      icon = pname;
-      inherit desktopName;
-      genericName = d'.meta.description;
-      categories = ["Network" "InstantMessaging"];
-      mimeTypes = ["x-scheme-handler/discord"];
-    };
-  in
-    if prev.stdenv.isLinux
-    then d'.overrideAttrs (_: {inherit desktopItem;})
-    else d';
-in {
-  discord = mkOverride prev.discord;
-  discord-canary = mkOverride prev.discord-canary;
-}
diff --git a/overlays/fish.nix b/overlays/fish.nix
deleted file mode 100644
index 4e7fffc..0000000
--- a/overlays/fish.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-_: prev: {
-  fish =
-    if prev.stdenv.isLinux
-    then
-      prev.symlinkJoin {
-        inherit (prev.fish) passthru;
-        name = "fish-nodesktop";
-        paths = [prev.fish];
-        postBuild = ''
-          rm $out/share/applications/fish.desktop
-        '';
-      }
-    else prev.fish;
-}
-- 
cgit v1.2.3