diff --git a/fcitx5/default.nix b/fcitx5/default.nix
new file mode 100644
index 0000000..77f1694
--- /dev/null
+++ b/fcitx5/default.nix
@@ -0,0 +1,14 @@
+{
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    # Commented out, not working
+    #fcitx.engines = with pkgs.fcitx-engines; [ anthy ];
+  };
+
+  home.sessionVariables = {
+    GTK_IM_MDOULE = "fcitx";
+    QT_IM_MODULE = "fcitx";
+    XMODIFIERS = "@im=fcitx";
+    GLFW_IM_MODULE = "ibus"; # IME support in anthy
+  };
+}
diff --git a/hosts/home.nix b/hosts/home.nix
index 911a372..b5df3ef 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -7,6 +7,7 @@ in
 {
   imports = [
     ../vim.nix
+    ../fcitx5
     ../wallpaper.nix
     ../picom.nix
     ../i3.nix
@@ -39,12 +40,6 @@ in
     platformTheme = "gtk";
   };
 
-  i18n.inputMethod = {
-    enabled = "fcitx5";
-    # Commented out, not working
-    # fcitx.engines = with pkgs.fcitx-engines; [ anthy ];
-  };
-
   home = {
     username = "${user}";
     homeDirectory = "/home/${user}";
@@ -62,18 +57,7 @@ in
       firefox
       discord
       gnome.nautilus
-
-      # Configuration applications
-      fcitx5-configtool
     ];
-
-    sessionVariables = {
-      EDITOR = "vim";
-      GTK_IM_MDOULE = "fcitx";
-      QT_IM_MODULE = "fcitx";
-      XMODIFIERS = "@im=fcitx";
-      GLFW_IM_MODULE = "ibus"; # IME support in anthy
-    };
   };
 
   programs.bash = {