diff --git a/configuration.nix b/configuration.nix
index 9abe104..c019a18 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,7 +5,7 @@
       # Include the results of the hardware scan.
       ./modules/fonts.nix
       ./modules/tabletdriver.nix
-      ./sway/sway-conf.nix
+      ./sway
     ];
 
   # Bootloader.
diff --git a/sway/sway-conf.nix b/sway/default.nix
similarity index 98%
rename from sway/sway-conf.nix
rename to sway/default.nix
index e6710be..e305dd6 100644
--- a/sway/sway-conf.nix
+++ b/sway/default.nix
@@ -147,7 +147,6 @@
         "otd-daemon"
         dunst
         (pkgs.writeShellScriptBin "rmenu-cache-clear" "rm -r $HOME/.cache/rmenu") # invalidate rmenu cache on sway restart
-        "systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP"
         "dbus-update-activation-environment"
       ];
       extraConfig = ''
@@ -171,6 +170,7 @@
         
         input * {
           xkb_layout "de"
+          dwt disabled
         }
 
         for_window [app_id="swaymux"] floating enable