From 6da0f503e187fada0b6f8c9c255493c1823d91a8 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/sway/config/config.d/custom-keybindings.conf | 2 +-
 overlays/overrides.nix                               | 9 +++++++++
 profiles/base-user/session-variables.nix             | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/sway/config/config.d/custom-keybindings.conf b/modules/sway/config/config.d/custom-keybindings.conf
index 2b7ba20d..d5887e3e 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 4f94b6a9..4c5964ff 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,6 +14,15 @@ channels: final: prev: {
     signal-desktop
     starship
     deploy-rs
+
+    neovim-unwrapped
+    tdesktop
+    xdg-desktop-portal
+    xdg-desktop-portal-gtk
+    xdg-desktop-portal-wlr
+    obs-studio
+    obs-studio-plugins
+    looking-glass-client
     ;
 
   # nix is set to 2.3 in 21.11
diff --git a/profiles/base-user/session-variables.nix b/profiles/base-user/session-variables.nix
index 4e745bba..a180da6e 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";