diff options
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/default.nix | 12 | ||||
| -rw-r--r-- | overlays/discord.nix | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/overlays/default.nix b/overlays/default.nix index 6a2acff..36986a5 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,10 +1,12 @@ { flake.overlays.default = final: prev: - prev.lib.composeManyExtensions [ - (import ./btop.nix) - (import ./discord.nix) - (import ./fish.nix) - ] + 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 index dfb0cae..cb651cd 100644 --- a/overlays/discord.nix +++ b/overlays/discord.nix @@ -10,6 +10,7 @@ _: prev: let 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}"; @@ -22,9 +23,7 @@ _: prev: let in if prev.stdenv.isLinux then d'.overrideAttrs (_: {inherit desktopItem;}) - else if (pname == "discord" && prev.stdenv.isDarwin) - then d' - else d; + else d'; in { discord = mkOverride prev.discord; discord-canary = mkOverride prev.discord-canary; |