From 7e24ef52bc19d90273a0807af741575e7763f137 Mon Sep 17 00:00:00 2001
From: ringo32 <ringodekroon@gmail.com>
Date: Sat, 16 Dec 2023 17:57:43 +0100
Subject: [PATCH] removed autostart and in condif environmental settings using
 standard sway example. and adding environment.d change .profile to point
 blanc

---
 .config/environment.d/.profile               |  6 ++++++
 .config/environment.d/30-envvars.conf        | 10 ++++++++++
 .config/sway/config                          |  5 +----
 .config/sway/config.d/50-systemd-user.conf   | 16 ++++++++++++++++
 .config/sway/config.d/autostart_applications |  5 +----
 .config/wofi/config                          |  1 +
 .profile                                     |  6 ------
 7 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 .config/environment.d/.profile
 create mode 100644 .config/environment.d/30-envvars.conf
 create mode 100644 .config/sway/config.d/50-systemd-user.conf

diff --git a/.config/environment.d/.profile b/.config/environment.d/.profile
new file mode 100644
index 0000000..e48cecd
--- /dev/null
+++ b/.config/environment.d/.profile
@@ -0,0 +1,6 @@
+export MOZ_ENABLE_WAYLAND=1
+export XDG_CURRENT_DESKTOP=sway
+export XDG_SESSION_TYPE=wayland
+export WLR_NO_HARDWARE_CURSORS=1
+#export WLR_NO_HARDWARE_CURSORS=0
+export WLR_RENDERER_ALLOW_SOFTWARE=1
diff --git a/.config/environment.d/30-envvars.conf b/.config/environment.d/30-envvars.conf
new file mode 100644
index 0000000..de07a33
--- /dev/null
+++ b/.config/environment.d/30-envvars.conf
@@ -0,0 +1,10 @@
+# Default env vars.
+#XDG_CURRENT_DESKTOP=sway 
+#XDG_SESSION_TYPE,wayland 
+#XDG_SESSION_DESKTOP=sway 
+MOZ_ENABLE_WAYLAND=1
+GDK_BACKEND=wayland
+WLR_NO_HARDWARE_CURSORS=1
+GDK_BACKEND=wayland
+WLR_RENDERER_ALLOW_SOFTWARE=1
+OZONE_PLATFORM=wayland
diff --git a/.config/sway/config b/.config/sway/config
index a20d095..0a93add 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -5,10 +5,7 @@ exec ~/set_once.sh
 #
 # Read `man 5 sway` for a complete reference.
 
-# announce a running sway session to systemd
-exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-
+#
 # user config directory
 include $HOME/.config/sway/config.d/*
 
diff --git a/.config/sway/config.d/50-systemd-user.conf b/.config/sway/config.d/50-systemd-user.conf
new file mode 100644
index 0000000..8781db9
--- /dev/null
+++ b/.config/sway/config.d/50-systemd-user.conf
@@ -0,0 +1,16 @@
+# sway does not set DISPLAY/WAYLAND_DISPLAY in the systemd user environment
+# See FS#63021
+# Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal.
+
+# Upstream refuses to set XDG_CURRENT_DESKTOP so we have to.
+exec systemctl --user set-environment XDG_CURRENT_DESKTOP=sway
+exec systemctl --user import-environment DISPLAY \
+                                         SWAYSOCK \
+                                         WAYLAND_DISPLAY \
+                                         XDG_CURRENT_DESKTOP
+
+exec hash dbus-update-activation-environment 2>/dev/null && \
+     dbus-update-activation-environment --systemd DISPLAY \
+                                                  SWAYSOCK \
+                                                  XDG_CURRENT_DESKTOP=sway \
+                                                  WAYLAND_DISPLAY
diff --git a/.config/sway/config.d/autostart_applications b/.config/sway/config.d/autostart_applications
index 50e91cb..0b59ce7 100644
--- a/.config/sway/config.d/autostart_applications
+++ b/.config/sway/config.d/autostart_applications
@@ -7,10 +7,7 @@ exec mako
 # Network Applet
 exec nm-applet --indicator
 
-# GTK3 applications take a long time to start
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec hash dbus-update-activation-environment 2>/dev/null && \
-     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+
      
 # Welcome App
 exec dex -a -s /etc/xdg/autostart/:~/.config/autostart/  
diff --git a/.config/wofi/config b/.config/wofi/config
index a7f1910..091c2f0 100644
--- a/.config/wofi/config
+++ b/.config/wofi/config
@@ -15,3 +15,4 @@ prompt=
 image_size=15
 display_generic=true
 location=center
+columns=2
diff --git a/.profile b/.profile
index e48cecd..e69de29 100644
--- a/.profile
+++ b/.profile
@@ -1,6 +0,0 @@
-export MOZ_ENABLE_WAYLAND=1
-export XDG_CURRENT_DESKTOP=sway
-export XDG_SESSION_TYPE=wayland
-export WLR_NO_HARDWARE_CURSORS=1
-#export WLR_NO_HARDWARE_CURSORS=0
-export WLR_RENDERER_ALLOW_SOFTWARE=1