diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 07988cc6..59ecb0e2 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -4,6 +4,10 @@
   lib,
   ...
 }: {
+  imports = [
+    ./wayland-apps.nix
+  ];
+
   # hyprland configs, based on https://github.com/notwidow/hyprland
   home.file.".config/hypr" = {
     source = ./hypr-conf;
diff --git a/home/programs/browsers.nix b/home/hyprland/wayland-apps.nix
similarity index 94%
rename from home/programs/browsers.nix
rename to home/hyprland/wayland-apps.nix
index acde7d41..71927412 100644
--- a/home/programs/browsers.nix
+++ b/home/hyprland/wayland-apps.nix
@@ -2,7 +2,6 @@
   pkgs,
   nixpkgs-stable,
   config,
-  nil,
   ...
 }: let
   pkgs-stable = import nixpkgs-stable {
@@ -12,9 +11,6 @@
   in {
   home.packages = with pkgs-stable; [
     firefox-wayland  # firefox with wayland support
-    # firefox
-    
-    nil.packages."${pkgs.system}".default  # nix language server
   ];
 
 
diff --git a/home/i3/default.nix b/home/i3/default.nix
index 2675d05c..57f66de2 100644
--- a/home/i3/default.nix
+++ b/home/i3/default.nix
@@ -7,6 +7,10 @@
   # i3 配置，基于 https://github.com/endeavouros-team/endeavouros-i3wm-setup
   # 直接从当前文件夹中读取配置文件作为配置内容
 
+  imports = [
+    ./x11-apps.nix
+  ];
+
   # wallpaper, binary file
   home.file.".config/i3/wallpaper.png".source = ../wallpapers/wallpaper.png;
   home.file.".config/i3/config".source = ./config;
diff --git a/home/i3/x11-apps.nix b/home/i3/x11-apps.nix
new file mode 100644
index 00000000..b216554a
--- /dev/null
+++ b/home/i3/x11-apps.nix
@@ -0,0 +1,37 @@
+{
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [
+    firefox
+  ];
+
+
+  # TODO vscode & chrome both have wayland support, but they don't work with fcitx5, need to fix it.
+  programs = {
+
+    # source code: https://github.com/nix-community/home-manager/blob/master/modules/programs/chromium.nix
+    google-chrome = {
+      enable = true;
+
+      # chrome wayland support was broken on nixos-unstable branch, so fallback to stable branch for now
+      # https://github.com/swaywm/sway/issues/7562
+      package = pkgs.google-chrome;
+
+      # commandLineArgs = [
+      # ];
+    };
+
+    vscode = {
+      enable = true;
+      # use the stable version
+      # package = pkgs.vscode.override {
+      #   commandLineArgs = [
+      #   ];
+      # };
+
+      # let vscode sync and update its configuration & extensions across devices, using github account.
+      # userSettings = {};
+    };
+  };
+}
diff --git a/home/programs/common.nix b/home/programs/common.nix
index c499a25d..1cef888e 100644
--- a/home/programs/common.nix
+++ b/home/programs/common.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}: 
+{pkgs, config, nil, ...}: 
 
 
 {
@@ -29,6 +29,8 @@
     obsidian
     hugo
 
+    nil.packages."${pkgs.system}".default  # nix language server
+
     # IDE
     insomnia
     jetbrains.pycharm-community
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 11941d5b..74ecdb1e 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -4,7 +4,6 @@
   ...
 }: {
   imports = [
-    ./browsers.nix
     ./common.nix
     ./git.nix
     ./media.nix
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 0a2a1521..b2c8792d 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -24,7 +24,11 @@ in rec {
     LESSHISTFILE = cache + "/less/history";
     LESSKEY = c + "/less/lesskey";
     WINEPREFIX = d + "/wine";
-    XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
+
+    # set this variable make i3 failed to start
+    # related issue:
+    #   https://github.com/sddm/sddm/issues/871
+    # XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
 
     # set default applications
     BROWSER = "firefox";