From 40bc3134295aab3cbeec523ebb829b9a275a4082 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 12 Jun 2024 20:37:19 +0200
Subject: [PATCH] Remove workaround for 316784

---
 home/fish/fish.nix                       | 1 -
 home/modules/linux/graphical/wayland.nix | 1 -
 modules/common/linux/default.nix         | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/home/fish/fish.nix b/home/fish/fish.nix
index f24a6e0..079091f 100644
--- a/home/fish/fish.nix
+++ b/home/fish/fish.nix
@@ -23,7 +23,6 @@ let
         systemctl --user unset-environment NIXOS_OZONE_WL
         exec sway
       case "KDE Plasma"
-        systemctl --user set-environment NIXOS_OZONE_WL=1
         exec ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed startplasma-wayland
       case '*'
         exec fish -i
diff --git a/home/modules/linux/graphical/wayland.nix b/home/modules/linux/graphical/wayland.nix
index 0b03a41..7073057 100644
--- a/home/modules/linux/graphical/wayland.nix
+++ b/home/modules/linux/graphical/wayland.nix
@@ -56,7 +56,6 @@ let
       kmail-account-wizard
       akonadi-import-wizard
     ];
-    # Not working yet, see #316784
     xdg.configFile."plasma-workspace/env/wayland.sh".source = pkgs.writeScript "plasma-wayland-env.sh" ''
       export NIXOS_OZONE_WL=1
     '';
diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix
index de3824a..0e97b7d 100644
--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@@ -304,7 +304,7 @@ in
       wlr.enable = true;
       xdgOpenUsePortal = true;
       # gtk portal needed to make gtk apps happy
-      extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
+      extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-gtk ];
 
       config.sway.default = [ "wlr" "kde" ];
     };