diff --git a/sway/sway/config.d/input.conf b/sway/sway/config.d/input.conf
index 50ba992bb..587ad8e10 100644
--- a/sway/sway/config.d/input.conf
+++ b/sway/sway/config.d/input.conf
@@ -3,7 +3,6 @@
 
 input "type:keyboard" {
   xkb_layout us,ir
-  xkb_options grp:win_space_toggle
 }
 
 input "type:touchpad" {
diff --git a/sway/sway/hosts/x-wing.conf b/sway/sway/hosts/x-wing.conf
index c4bcd81af..144963e02 100644
--- a/sway/sway/hosts/x-wing.conf
+++ b/sway/sway/hosts/x-wing.conf
@@ -1,5 +1,10 @@
 # vim: ft=i3config
 # sway config file
 
+# provide support for en/fa layouts
+# swaymsg -t get_inputs
+bindsym --to-code $mod+space exec "swaymsg input '1133:49948:Logitech_USB_Keyboard_Consumer_Control' xkb_switch_layout next"
+bindsym --to-code XF86WakeUp exec "swaymsg input '1:1:AT_Translated_Set_2_keyboard' xkb_switch_layout next"
+
 # output eDP-1 scale 0.9
 output eDP-1 adaptive_sync true