From 415edf41f300e950f59d1e7a7c22b037f609d9de Mon Sep 17 00:00:00 2001 From: uku Date: Mon, 17 Feb 2025 11:55:42 +0100 Subject: [PATCH] feat(desktop): replace vesktop with stock discord --- configs/desktop.nix | 5 ++++- exprs/overlay.nix | 15 ++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index f87a1f3..ef35cb7 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -77,6 +77,10 @@ home = { packages = with pkgs; [ chromium + (discord.override { + withOpenASAR = true; + withVencord = true; + }) gimp gparted idea-ultimate-fixed @@ -85,7 +89,6 @@ strawberry teams-for-linux thunderbird - (vesktop.override { withSystemVencord = true; }) vscode # libreoffice stuff diff --git a/exprs/overlay.nix b/exprs/overlay.nix index a45d2af..9669a1e 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -11,29 +11,18 @@ inputs: final: prev: { ]; }); - vencord = prev.vencord.overrideAttrs (old: rec { + vencord = prev.vencord.overrideAttrs (old: { version = "${old.version}+git.${inputs.vencord.shortRev}"; src = inputs.vencord; env = old.env // { VENCORD_REMOTE = "Vendicated/Vencord"; - VENCORD_HASH = src.shortRev; + VENCORD_HASH = inputs.vencord.shortRev; }; pnpmDeps = old.pnpmDeps.overrideAttrs (_: { outputHash = "sha256-ZUwtNtOmxjhOBpYB7vuytunGBRSuVxdlQsceRmeyhhI="; outputHashAlgo = "sha256"; }); - - ventex = prev.fetchFromGitHub { - owner = "vgskye"; - repo = "ventex"; - rev = "158c14e7d88acb140a71766c514d8a3724d260cd"; - hash = "sha256-Svc8dI2weFcqPSk064t/pL/4Hopn6/mWP6cIrT+FIr8="; - }; - - postConfigure = '' - cp -r ${ventex} src/plugins/ventex - ''; }); }