From db9f8c8f586015bfdf86cfcc7277d1df21bcef5a Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Fri, 22 Oct 2021 12:49:36 +0530
Subject: [PATCH] sway: Fix import of environment variables

See https://wiki.archlinux.org/title/Sway#Manage_Sway-specific_daemons_with_systemd.
---
 environment/.config/environment.d/envvars.conf | 1 +
 sway/.config/sway/config                       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/environment/.config/environment.d/envvars.conf b/environment/.config/environment.d/envvars.conf
index 1a4ec24..4938c26 100644
--- a/environment/.config/environment.d/envvars.conf
+++ b/environment/.config/environment.d/envvars.conf
@@ -1,2 +1,3 @@
 XDG_CURRENT_DESKTOP="sway"
 MOZ_ENABLE_WAYLAND=1
+GTK_USE_PORTAL=0
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 3882cab..7e9766b 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -270,4 +270,5 @@ assign [app_id="gst-launch-1.0"] 4
 # Call kanshi to automatically configure connected display outputs
 # exec kanshi
 # Load environment variables
-exec "systemctl --user import-environment"
+exec systemctl --user import-environment XDG_CURRENT_DESKTOP MOZ_ENABLE_WAYLAND GTK_USE_PORTAL
+include /etc/sway/config.d/*