From 35aea1d8df61069ab0394c7a633b12c62b3d9423 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@reekynet.com>
Date: Tue, 3 Mar 2020 13:51:13 +0200
Subject: [PATCH] Move env to /etc

---
 home/.config/sway/env | 19 -------------------
 root/etc/environment  | 20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 home/.config/sway/env

diff --git a/home/.config/sway/env b/home/.config/sway/env
deleted file mode 100644
index 5aa0118..0000000
--- a/home/.config/sway/env
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fix java on wayland
-_JAVA_AWT_WM_NONREPARENTING=1
-_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
-
-# Enable qt5 theming and wayland support
-QT_QPA_PLATFORMTHEME=qt5ct
-QT_QPA_PLATFORM=wayland-egl
-QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-
-# Firefox
-MOZ_ENABLE_WAYLAND=1
-MOZ_USE_XINPUT2=1
-MOZ_WEBRENDER=1
-
-# Fix redshift on wlroots
-WLR_DRM_NO_ATOMIC=1
-
-# Use wayland in SDL2
-SDL_VIDEODRIVER=wayland
diff --git a/root/etc/environment b/root/etc/environment
index a5e7f90..5aa0118 100755
--- a/root/etc/environment
+++ b/root/etc/environment
@@ -1 +1,19 @@
-XDG_SESSION_TYPE=wayland
+# Fix java on wayland
+_JAVA_AWT_WM_NONREPARENTING=1
+_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+
+# Enable qt5 theming and wayland support
+QT_QPA_PLATFORMTHEME=qt5ct
+QT_QPA_PLATFORM=wayland-egl
+QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+
+# Firefox
+MOZ_ENABLE_WAYLAND=1
+MOZ_USE_XINPUT2=1
+MOZ_WEBRENDER=1
+
+# Fix redshift on wlroots
+WLR_DRM_NO_ATOMIC=1
+
+# Use wayland in SDL2
+SDL_VIDEODRIVER=wayland