diff --git a/hosts/x1g9/hardware-configuration.nix b/hosts/x1g9/hardware-configuration.nix
index b172de5..7aa4105 100644
--- a/hosts/x1g9/hardware-configuration.nix
+++ b/hosts/x1g9/hardware-configuration.nix
@@ -8,18 +8,18 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/41636b9d-4d0d-4f4f-9f24-946041653d49";
+    { device = "/dev/disk/by-uuid/16b29578-6836-414b-a5e1-863bc21c5fc3";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DE18-74DC";
+    { device = "/dev/disk/by-uuid/209A-C8C9";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
diff --git a/modules/core/i18n.nix b/modules/core/i18n.nix
index 45bdfb1..3887919 100644
--- a/modules/core/i18n.nix
+++ b/modules/core/i18n.nix
@@ -15,11 +15,11 @@
             };
             "Groups/0" = {
                 Name = "Default";
-                "Default Layout" = "jp";
+                "Default Layout" = "keyboard-jp";
                 DefaultIM = "mozc";
             };
             "Groups/0/Items/0" = {
-                Name = "ja";
+                Name = "keyboard-jp";
                 Layout = "";
             };
             "Groups/0/Items/1" = {
diff --git a/modules/home/fcitx5/config b/modules/home/fcitx5/config
index e08d196..1e330aa 100644
--- a/modules/home/fcitx5/config
+++ b/modules/home/fcitx5/config
@@ -1,31 +1,16 @@
 [Hotkey]
 # トリガーキーを押すたびに切り替える
-EnumerateWithTriggerKeys=True
+EnumerateWithTriggerKeys=False
 # 一時的に第1入力メソッドに切り替える
 AltTriggerKeys=
 # 切り替え時は第1入力メソッドをスキップする
 EnumerateSkipFirst=False
 # Time limit in milliseconds for triggering modifier key shortcuts
 ModifierOnlyKeyTimeout=250
-Enable=Henkan
-Disable=Muhenkan
 
 [Hotkey/TriggerKeys]
-0=Control+space
 1=Zenkaku_Hankaku
 
-[Hotkey/EnumerateForwardKeys]
-0=Muhenkan
-
-[Hotkey/EnumerateBackwardKeys]
-0=Henkan
-
-[Hotkey/EnumerateGroupForwardKeys]
-0=Super+space
-
-[Hotkey/EnumerateGroupBackwardKeys]
-0=Shift+Super+space
-
 [Hotkey/ActivateKeys]
 0=Henkan
 
diff --git a/modules/home/niri/config.kdl b/modules/home/niri/config.kdl
index e9a8735..2e7e69b 100644
--- a/modules/home/niri/config.kdl
+++ b/modules/home/niri/config.kdl
@@ -364,7 +364,7 @@ binds {
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T hotkey-overlay-title="Open a Terminal: alacritty" { spawn "alacritty"; }
-    Mod+D hotkey-overlay-title="Run an Application: vicinae" { spawn "vicinae toggle"; }
+    Mod+D hotkey-overlay-title="Run an Application: vicinae" { spawn "vicinae" "toggle"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
 
     // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc.