From 5b3727f467b23273a246e5481afb34d181234481 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 4 Feb 2024 19:52:55 +0300 Subject: [PATCH] Use Element too and dont try to make discord use wayland because it doesn't --- BROKEN.md | 2 -- modules/discord.nix | 12 ++---------- modules/packages.nix | 1 + 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/BROKEN.md b/BROKEN.md index fb6d157..c4084a9 100644 --- a/BROKEN.md +++ b/BROKEN.md @@ -5,8 +5,6 @@ - Some Nginx headers were commented out because it collided or something. Idfk. Make them not. Uncomment. -- Discord does not use Wayland. - - QT theme doesn't work. - Nushell custom prompt title does not work, as it gets diff --git a/modules/discord.nix b/modules/discord.nix index 91028a5..a318d9c 100644 --- a/modules/discord.nix +++ b/modules/discord.nix @@ -9,16 +9,8 @@ }) (desktopHomePackages (with pkgs; [ - ((discord-canary.override { + (discord-canary.override { withOpenASAR = true; withVencord = true; - }).overrideAttrs (old: with pkgs; { - libPath = old.libPath + ":${libglvnd}/lib"; - nativeBuildInputs = old.nativeBuildInputs ++ [ makeWrapper ]; - - postFixup = '' - wrapProgram $out/opt/DiscordCanary/DiscordCanary \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" - ''; - })) + }) ])) diff --git a/modules/packages.nix b/modules/packages.nix index c7e720f..4b13447 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -41,6 +41,7 @@ ])) (desktopHomePackages (with pkgs; [ + element-desktop fractal qbittorrent thunderbird