From 354363233a36da1d07e8f3dd135e2f21991d9b24 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Fri, 3 Mar 2023 19:05:10 -0500
Subject: [PATCH] Switch back to electron discord

---
 flake.nix                                     | 12 +++++------
 .../linux/programs/communications.nix         | 20 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7447be4..1c7b1e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -214,22 +214,22 @@
           # Special handling for discord, as it's unfree _and_ insecure!
           config = {
             allowUnfree = true;
-            permittedInsecurePackages = [ "electron-13.6.9" ];
+            permittedInsecurePackages = [ "electron-16.2.3" ];
           };
         };
       in {
         packages = flake-utils.lib.flattenTree {
           discordWayland = pkgs.callPackage ./packages/discord/default.nix rec {
             pname = "discord-electron";
-            binaryName = "Discord";
+            binaryName = "DiscordCanary";
             desktopName = "Discord (Wayland)";
-            version = "0.0.22";
+            version = "0.0.148";
             src = pkgs.fetchurl {
               url =
-                "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-              hash = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c=";
+                "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
+              hash = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk=";
             };
-            electron = pkgs.electron_13;
+            electron = pkgs.electron_22;
           };
           swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
         };
diff --git a/home-manager/linux/programs/communications.nix b/home-manager/linux/programs/communications.nix
index 713085f..c59d10f 100644
--- a/home-manager/linux/programs/communications.nix
+++ b/home-manager/linux/programs/communications.nix
@@ -54,13 +54,13 @@
           terminal = false;
         };
         # Discord
-        discordItem = pkgs.makeDesktopItem {
-          name = "discord";
-          desktopName = "Discord (Chromium)";
-          exec = ''
-            ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://discord.com/app"'';
-          terminal = false;
-        };
+        # discordItem = pkgs.makeDesktopItem {
+        #   name = "discord";
+        #   desktopName = "Discord (Chromium)";
+        #   exec = ''
+        #     ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://discord.com/app"'';
+        #   terminal = false;
+        # };
         # Messages
         messagesItem = pkgs.makeDesktopItem {
           name = "messages";
@@ -71,9 +71,9 @@
         };
       in [
         # Discord
-        # inputs.self.packages.${pkgs.system}.discordWayland
-        # betterdiscordctl
-        discordItem
+        inputs.self.packages.${pkgs.system}.discordWayland
+        betterdiscordctl
+        # discordItem
         # Desktop matrix client
         (enableWayland element-desktop "element-desktop")
         # Desktop signal client