From 2748fbcdee0df2e6ef10fa849bd518385c8a1f40 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Mon, 31 Jan 2022 17:09:49 +0100
Subject: [PATCH] wayland: use NIXOS_OZONE_WL instead of *-wayland packages

---
 modules/social/default.nix                           | 2 +-
 modules/sway/config/config.d/custom-keybindings.conf | 2 +-
 overlays/overrides.nix                               | 1 -
 profiles/base-user/session-variables.nix             | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/social/default.nix b/modules/social/default.nix
index 90a23c3e..f3aa63b7 100644
--- a/modules/social/default.nix
+++ b/modules/social/default.nix
@@ -15,7 +15,7 @@ in
         #mySignalDesktop
         signal-desktop
         tdesktop
-        element-desktop-wayland
+        element-desktop
         irssi
       ];
     };
diff --git a/modules/sway/config/config.d/custom-keybindings.conf b/modules/sway/config/config.d/custom-keybindings.conf
index 6218d900..5faddece 100644
--- a/modules/sway/config/config.d/custom-keybindings.conf
+++ b/modules/sway/config/config.d/custom-keybindings.conf
@@ -18,7 +18,7 @@ bindsym $mod+F2 exec firefox
 bindsym $mod+F3 exec $term -e vifm
 bindsym $mod+Shift+F3 exec gksu $term -e vifm
 bindsym $mod+F4 exec nautilus -w
-bindsym $mod+Shift+F4 exec signal-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland
+bindsym $mod+Shift+F4 exec signal-desktop
 bindsym $mod+F5 exec $term -e 'mocp -C $XDG_CONFIG_DIR/mocp/config'
 bindsym $mod+Shift+m exec mu
 bindsym $mod+Shift+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 5c114143..c0cb58ad 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,7 +14,6 @@ channels: final: prev: {
     starship
     deploy-rs
 
-    element-desktop-wayland
     neovim-unwrapped
     tdesktop
     xdg-desktop-portal
diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index 264d787f..cc3aa69f 100644
--- a/profiles/base-user/session-variables.nix
+++ b/profiles/base-user/session-variables.nix
@@ -58,6 +58,9 @@ let
     # experimental wayland in firefox/thunderbird
     MOZ_ENABLE_WAYLAND = "1";
 
+    # chromium / electron on wayland: enable ozone (native wayland mode)
+    NIXOS_OZONE_WL = "1";
+
     # Vagrant
     VAGRANT_HOME = "${xdg.dataHome}/vagrant";
     VAGRANT_DEFAULT_PROVIDER = "libvirt";