diff --git a/config.nix b/config.nix
index 97b5f8c..837a61e 100644
--- a/config.nix
+++ b/config.nix
@@ -62,14 +62,13 @@ in
           git
         ];
       };
-<<<<<<< HEAD
 
       wayland.windowManager.sway = {
         enable = true;
         config = {
           startup = [
             {
-              command = "firefox-esr --kiosk c3nav.de";
+              command = "firefox-esr --kiosk c3nav.de"; always = true;
             }
           ];
           fonts = {
@@ -86,11 +85,6 @@ in
         '';
       };
 
-=======
-      wayland.windowManager.sway.config.startup = [
-        { command = "firefox-esr --kiosk c3nav.de"; always = true; }
-      ];
->>>>>>> f295282 (Attempt to fix the hardcoded device)
       programs = {
         firefox = {
           enable = true;
@@ -172,10 +166,16 @@ in
       };
     };
   };
-
   programs.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
+    extraSessionCommands = ''
+      export SDL_VIDEODRIVER=wayland
+      export QT_QPA_PLATFORM=wayland
+      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+      export _JAVA_AWT_WM_NONREPARENTING=1
+      export MOZ_ENABLE_WAYLAND=1
+    '';
   };
 
   nix = {