diff --git a/inventories/default.nix b/inventories/default.nix
index 2050e04..ab49d23 100644
--- a/inventories/default.nix
+++ b/inventories/default.nix
@@ -7,7 +7,10 @@
           "vega"
           "ramus"
         ];
-        w = [ "sirius" ];
+        w = [
+          "sirius"
+          "rana"
+        ];
         b4l = [
           "rigel"
           "neptune"
diff --git a/modules/home-manager/emmie/default.nix b/modules/home-manager/emmie/default.nix
index b691047..f653dcf 100644
--- a/modules/home-manager/emmie/default.nix
+++ b/modules/home-manager/emmie/default.nix
@@ -18,6 +18,12 @@ in
     ];
   };
 
+  services.xserver = {
+    enable = true;
+    xkb.layout = "us,th`";
+    xkbOptions = "grp:win_space_toggle";
+  };
+
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.${username} = ./home.nix;
diff --git a/modules/home-manager/emmie/home.nix b/modules/home-manager/emmie/home.nix
index a3541e7..0118263 100644
--- a/modules/home-manager/emmie/home.nix
+++ b/modules/home-manager/emmie/home.nix
@@ -12,11 +12,6 @@ in
     inherit username;
     homeDirectory = lib.mkForce "/home/${username}";
     stateVersion = osConfig.system.stateVersion;
-    keyboard.layout = "us,th";
-    keyboard.options = [
-      "grp:win_space_toggle"
-      "grp:alt_shift_toggle"
-    ];
     packages = with pkgs; [
       libreoffice
       element-desktop