diff --git a/home/base/tui/editors/neovim/default.nix b/home/base/tui/editors/neovim/default.nix
index 6a49aa16..c1196e65 100644
--- a/home/base/tui/editors/neovim/default.nix
+++ b/home/base/tui/editors/neovim/default.nix
@@ -20,55 +20,61 @@ let
   configPath = "${config.home.homeDirectory}/nix-config/home/base/tui/editors/neovim/nvim";
 in {
   xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink configPath;
+  # Disable catppuccin to avoid conflict with my non-nix config.
+  catppuccin.nvim.enable = false;
 
   home.shellAliases = shellAliases;
   programs.nushell.shellAliases = shellAliases;
 
-  programs = {
-    neovim = {
-      enable = true;
-      package = pkgs-unstable.neovim-unwrapped;
+  programs.neovim = {
+    enable = true;
+    package = pkgs-unstable.neovim-unwrapped;
 
-      # defaultEditor = true; # set EDITOR at system-wide level
-      viAlias = true;
-      vimAlias = true;
+    # defaultEditor = true; # set EDITOR at system-wide level
+    viAlias = true;
+    vimAlias = true;
 
-      # These environment variables are needed to build and run binaries
-      # with external package managers like mason.nvim.
-      #
-      # LD_LIBRARY_PATH is also needed to run the non-FHS binaries downloaded by mason.nvim.
-      # it will be set by nix-ld, so we do not need to set it here again.
-      extraWrapperArgs = with pkgs; [
-        # LIBRARY_PATH is used by gcc before compilation to search directories
-        # containing static and shared libraries that need to be linked to your program.
-        "--suffix"
-        "LIBRARY_PATH"
-        ":"
-        "${lib.makeLibraryPath [stdenv.cc.cc zlib]}"
+    # These environment variables are needed to build and run binaries
+    # with external package managers like mason.nvim.
+    #
+    # LD_LIBRARY_PATH is also needed to run the non-FHS binaries downloaded by mason.nvim.
+    # it will be set by nix-ld, so we do not need to set it here again.
+    extraWrapperArgs = with pkgs; [
+      # LIBRARY_PATH is used by gcc before compilation to search directories
+      # containing static and shared libraries that need to be linked to your program.
+      "--suffix"
+      "LIBRARY_PATH"
+      ":"
+      "${lib.makeLibraryPath [
+        stdenv.cc.cc
+        zlib
+      ]}"
 
-        # PKG_CONFIG_PATH is used by pkg-config before compilation to search directories
-        # containing .pc files that describe the libraries that need to be linked to your program.
-        "--suffix"
-        "PKG_CONFIG_PATH"
-        ":"
-        "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" [stdenv.cc.cc zlib]}"
-      ];
+      # PKG_CONFIG_PATH is used by pkg-config before compilation to search directories
+      # containing .pc files that describe the libraries that need to be linked to your program.
+      "--suffix"
+      "PKG_CONFIG_PATH"
+      ":"
+      "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
+        stdenv.cc.cc
+        zlib
+      ]}"
+    ];
 
-      # Currently we use lazy.nvim as neovim's package manager, so comment this one.
-      #
-      # NOTE: These plugins will not be used by astronvim by default!
-      # We should install packages that will compile locally or download FHS binaries via Nix!
-      # and use lazy.nvim's `dir` option to specify the package directory in nix store.
-      # so that these plugins can work on NixOS.
-      #
-      # related project:
-      #  https://github.com/b-src/lazy-nix-helper.nvim
-      plugins = with pkgs.vimPlugins; [
-        # search all the plugins using https://search.nixos.org/packages
-        telescope-fzf-native-nvim
+    # Currently we use lazy.nvim as neovim's package manager, so comment this one.
+    #
+    # NOTE: These plugins will not be used by astronvim by default!
+    # We should install packages that will compile locally or download FHS binaries via Nix!
+    # and use lazy.nvim's `dir` option to specify the package directory in nix store.
+    # so that these plugins can work on NixOS.
+    #
+    # related project:
+    #  https://github.com/b-src/lazy-nix-helper.nvim
+    plugins = with pkgs.vimPlugins; [
+      # search all the plugins using https://search.nixos.org/packages
+      telescope-fzf-native-nvim
 
-        nvim-treesitter.withAllGrammars
-      ];
-    };
+      nvim-treesitter.withAllGrammars
+    ];
   };
 }
diff --git a/home/linux/gui/base/fcitx5/default.nix b/home/linux/gui/base/fcitx5/default.nix
index 6afff3db..8d6f4746 100644
--- a/home/linux/gui/base/fcitx5/default.nix
+++ b/home/linux/gui/base/fcitx5/default.nix
@@ -7,7 +7,6 @@
       force = true;
     };
   };
-  catppuccin.fcitx5.enable = true;
 
   i18n.inputMethod = {
     enable = true;
diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix
index ece1f905..ba834ab2 100644
--- a/home/linux/gui/hyprland/values/hyprland.nix
+++ b/home/linux/gui/hyprland/values/hyprland.nix
@@ -21,18 +21,22 @@ in {
     enable = true;
     systemd.enable = true;
   };
+  # Disable catppuccin to avoid conflict with my non-nix config.
+  catppuccin.waybar.enable = false;
 
   # screen locker
   programs.hyprlock.enable = true;
 
   # Logout Menu
   programs.wlogout.enable = true;
+  catppuccin.wlogout.enable = false;
 
   # Hyprland idle daemon
   services.hypridle.enable = true;
 
   # notification daemon, the same as dunst
   services.mako.enable = true;
+  catppuccin.mako.enable = false;
 
   # NOTE:
   # We have to enable hyprland/i3's systemd user service in home-manager,