From 6cc35d471c19a1bff22a48d65c74da7ff9a5b56c Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 21 Dec 2023 17:14:55 +0100
Subject: [PATCH] element-desktop on Wayland and X11

---
 modules/element-desktop.nix | 18 ++++++------------
 modules/programs.nix        |  6 ++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/element-desktop.nix b/modules/element-desktop.nix
index 5d4689b..227cd42 100644
--- a/modules/element-desktop.nix
+++ b/modules/element-desktop.nix
@@ -2,18 +2,12 @@
 {
   users.users.yoda = {
     packages = with pkgs; [
-      # Matrix clients
-      element-desktop
-      #fluffychat
-      # Web version: https://app.cinny.in/
-      #cinny-desktop
-      # E2E encryption is not yet implemented: https://gitlab.gnome.org/GNOME/fractal/-/issues/717
-      #fractal
-      #nheko
+      # Matrix chat client.
+      (
+        if (config.services.xserver.displayManager.gdm.wayland)
+        then element-desktop-wayland
+        else element-desktop
+      )
     ];
   };
-
-  # The Element package already includes a wrapper that automatically adds `--enable-features=UseOzonePlatform` and `--ozone-platform=wayland` when `NIXOS_OZONE_WL` is set.
-  # https://discourse.nixos.org/t/partly-overriding-a-desktop-entry/20743/2
-  environment.sessionVariables.NIXOS_OZONE_WL = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1";
 }
diff --git a/modules/programs.nix b/modules/programs.nix
index 44373e1..b612fd4 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -21,7 +21,13 @@
       meld # Diff and merge tool
       handbrake # Rip DVD and Blu-ray; rotate and export videos
       mediainfo-gui # View video metadata.
+
       fractal # Matrix chat client.
+      # Other Matrix clients.
+      #   fluffychat
+      #   Web version: https://app.cinny.in/
+      #   cinny-desktop
+      #   element-desktop, see `element-desktop.nix`
 
       #
       # 3D modeling and printing