diff --git a/home/base/desktop/neovim/astronvim_user/init.lua b/home/base/desktop/neovim/astronvim_user/init.lua
index a98950b8..9cfc216c 100644
--- a/home/base/desktop/neovim/astronvim_user/init.lua
+++ b/home/base/desktop/neovim/astronvim_user/init.lua
@@ -26,8 +26,6 @@ return {
     { import = "astrocommunity.scrolling.nvim-scrollbar" },
     { import = "astrocommunity.editing-support.auto-save-nvim" },
     { import = "astrocommunity.editing-support.todo-comments-nvim" },
-    -- clipboard history manager
-    { import = "astrocommunity.editing-support.yanky-nvim" },
     -- Language Support
     ---- Frontend & NodeJS
     { import = "astrocommunity.pack.typescript-all-in-one" },
diff --git a/home/base/desktop/neovim/default.nix b/home/base/desktop/neovim/default.nix
index 4a7da5d6..8975fca0 100644
--- a/home/base/desktop/neovim/default.nix
+++ b/home/base/desktop/neovim/default.nix
@@ -10,19 +10,12 @@
 #e#############################################################################
 {
   xdg.configFile = {
-    # base config
-    "nvim" = {
-      # update AstroNvim
-      onChange = "${pkgs.neovim}/bin/nvim --headless +quitall";
-      source = astronvim;
-    };
+    # astronvim's config
+    "nvim".source = astronvim;
+
     # my cusotom astronvim config, astronvim will load it after base config
     # https://github.com/AstroNvim/AstroNvim/blob/v3.32.0/lua/astronvim/bootstrap.lua#L15-L16
-    "astronvim/lua/user" = {
-      # update AstroNvim
-      onChange = "${pkgs.neovim}/bin/nvim --headless +quitall";
-      source = ./astronvim_user;
-    };
+    "astronvim/lua/user".source = ./astronvim_user;
   };
 
   nixpkgs.config = {
@@ -41,7 +34,7 @@
 
       withPython3 = true;
       withNodeJs = true;
-      extraPackages = [];
+      extraPackages = with pkgs; [];
 
       # currently we use lazy.nvim as neovim's package manager, so comment this one.
       plugins = with pkgs.vimPlugins; [
diff --git a/home/base/desktop/terminal/wezterm.nix b/home/base/desktop/terminal/wezterm.nix
index 8f14fc23..26c4f781 100644
--- a/home/base/desktop/terminal/wezterm.nix
+++ b/home/base/desktop/terminal/wezterm.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  pkgs-unstable,
   catppuccin-wezterm,
   ...
 }:
@@ -16,6 +17,7 @@
 
   programs.wezterm = {
     enable = false;
+    package = pkgs-unstable.wezterm;
 
     extraConfig = 
       let