diff --git a/bash/.bashrc b/bash/.bashrc
index 2fdcaa5..2293469 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -87,11 +87,3 @@ source /usr/share/fzf/completion.bash
 #the-fuck
 eval $(thefuck --alias)
 
-export MOZ_USE_OMTC=1
-export MOZ_ENABLE_WAYLAND=1
-export SPICE_NOGRAB=1
-export QT_QPA_PLATFORM=wayland-egl
-export CLUTTER_BACKEND=wayland
-export SDL_VIDEODRIVER=wayland
-export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/sway/config b/sway/config
index e666b17..9a86069 100644
--- a/sway/config
+++ b/sway/config
@@ -257,8 +257,10 @@ smart_borders on
 smart_gaps off
 
 
-exec redshift-gtk
 exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec "systemctl --user import-environment; systemctl --user start sway-session.target"
+
+exec redshift-gtk
 exec keepassxc
 exec nextcloud
 exec dropbox
diff --git a/sway/env b/sway/env
new file mode 100644
index 0000000..51bb345
--- /dev/null
+++ b/sway/env
@@ -0,0 +1,8 @@
+MOZ_USE_OMTC=1
+MOZ_ENABLE_WAYLAND=0
+SPICE_NOGRAB=1
+QT_QPA_PLATFORM=wayland-egl
+CLUTTER_BACKEND=wayland
+SDL_VIDEODRIVER=wayland
+QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+_JAVA_AWT_WM_NONREPARENTING=1
diff --git a/systemd/user/sway-session.target b/systemd/user/sway-session.target
new file mode 100644
index 0000000..30151b3
--- /dev/null
+++ b/systemd/user/sway-session.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=sway compositor session
+Documentation=man:systemd.special(7)
+BindsTo=graphical-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target
diff --git a/systemd/user/sway.service b/systemd/user/sway.service
new file mode 100644
index 0000000..5e6e2e0
--- /dev/null
+++ b/systemd/user/sway.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=sway - SirCmpwn's Wayland window manager
+Documentation=man:sway(5)
+BindsTo=graphical-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target
+
+[Service]
+Type=simple
+EnvironmentFile=-%h/.config/sway/env
+ExecStart=/usr/bin/sway
+Restart=on-failure
+RestartSec=1
+TimeoutStopSec=10