From 9f47d5758fbe213789ff4496f405fedc58033d0b Mon Sep 17 00:00:00 2001 From: reidlab Date: Wed, 18 Feb 2026 22:56:00 -0800 Subject: [PATCH] switch to equibop --- hosts/goopnet-interface/default.nix | 2 +- modules/software/distractions/discord.nix | 36 +++++++---------------- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 2b48f99..8bb2486 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -94,7 +94,7 @@ dev.git.enable = true; # distractions distractions.discord.enable = true; - distractions.discord.vesktop = true; + distractions.discord.equibop = true; distractions.steam.enable = true; distractions.steam.useGamescope = true; # tools diff --git a/modules/software/distractions/discord.nix b/modules/software/distractions/discord.nix index 9797b7f..255e14b 100644 --- a/modules/software/distractions/discord.nix +++ b/modules/software/distractions/discord.nix @@ -3,47 +3,31 @@ with lib; let cfg = config.modules.software.distractions.discord; - flags = [ - "--flag-switches-begin" - "--disable-gpu-memory-buffer-video-frames" - "--enable-accelerated-mjpeg-decode" - "--enable-accelerated-video" - "--enable-gpu-rasterization" - "--enable-native-gpu-memory-buffers" - "--enable-zero-copy" - "--ignore-gpu-blocklist" - "--enable-features=UseOzonePlatform" - "--enable-features=VaapiVideoDecoder" - "--enable-features=VaapiVideoEncoder" - "--enable-features=WebRTCPipeWireCapturer" - "--flag-switches-end" - ]; vanillaDiscordPackage = pkgs.discord-canary.override { withOpenASAR = true; withVencord = true; }; - package = if cfg.armcord then pkgs.armcord else (if cfg.vesktop then pkgs.vesktop else vanillaDiscordPackage); + finalPackage = + if cfg.equibop then pkgs.equibop else + if cfg.vesktop then pkgs.vesktop else + vanillaDiscordPackage; in { options.modules.software.distractions.discord = { - enable = mkEnableOption "Enable discord, a social messaging app"; - armcord = mkEnableOption "Use Armcord, an alternative Electron client"; - vesktop = mkEnableOption "Use Vesktop, an alternative Electron client with vencord preinstalled"; + enable = mkEnableOption "Enable Discord, a social messaging app"; + vesktop = mkEnableOption "Use Vesktop, an alternative Electron client with Vencord preinstalled"; + equibop = mkEnableOption "Use Equibop, a fork of Vesktop with Equicord preinstalled"; }; config = mkIf cfg.enable { assertions = [ { - assertion = !(cfg.armcord && cfg.vesktop); - message = "You must either enable Armcord or Vesktop, not both"; + assertion = !(cfg.vesktop && cfg.equibop); + message = "You must either enable Vesktop or Equibop, not both"; } ]; user.packages = [ - (package.overrideAttrs (old: { - preInstall = '' - gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}") - ''; - })) + finalPackage ]; }; }