From 0f4a315658e6ef7eedcc79179c13ad5ac2edccf2 Mon Sep 17 00:00:00 2001
From: xinyangli <lixinyang411@gmail.com>
Date: Tue, 26 Nov 2024 17:37:16 +0800
Subject: [PATCH] calcite: move input methods from hm to system config

---
 home/xin/calcite.nix               | 12 +-----------
 machines/calcite/configuration.nix | 11 ++++++++++-
 modules/home-manager/zellij.nix    | 11 +++++++++++
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/home/xin/calcite.nix b/home/xin/calcite.nix
index 69d16d6..9f246cf 100644
--- a/home/xin/calcite.nix
+++ b/home/xin/calcite.nix
@@ -34,6 +34,7 @@ in
   };
 
   home.packages = with pkgs; [
+    resources
     thunderbird
     remmina
     qq
@@ -56,17 +57,6 @@ in
 
   xdg.enable = true;
 
-  i18n.inputMethod = {
-    enabled = "fcitx5";
-    fcitx5.addons = with pkgs; [ fcitx5-rime ];
-  };
-
-  # Using wayland
-  home.sessionVariables = {
-    GTK_IM_MODULE = lib.mkForce "";
-    QT_IM_MODULE = lib.mkForce "";
-  };
-
   custom-hm = {
     alacritty = {
       enable = true;
diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix
index 8ad5348..0e2bd85 100644
--- a/machines/calcite/configuration.nix
+++ b/machines/calcite/configuration.nix
@@ -105,6 +105,15 @@ in
     LC_TIME = "en_US.utf8";
   };
 
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+    fcitx5 = {
+      addons = [ pkgs.fcitx5-rime ];
+      waylandFrontend = true;
+    };
+  };
+
   # ====== GUI ======
 
   programs.niri.enable = true;
@@ -113,7 +122,7 @@ in
 
   catppuccin = {
     enable = true;
-    accent = "rosewater";
+    accent = "peach";
     flavor = "mocha";
   };
 
diff --git a/modules/home-manager/zellij.nix b/modules/home-manager/zellij.nix
index fcb8f04..7d7310d 100644
--- a/modules/home-manager/zellij.nix
+++ b/modules/home-manager/zellij.nix
@@ -18,6 +18,17 @@ in
     };
     xdg.configFile."zellij/config.kdl".text = ''
       keybinds {
+          shared {
+            bind "F1" { GoToTab 1; SwitchToMode "Normal"; }
+            bind "F2" { GoToTab 2; SwitchToMode "Normal"; }
+            bind "F3" { GoToTab 3; SwitchToMode "Normal"; }
+            bind "F4" { GoToTab 4; SwitchToMode "Normal"; }
+            bind "F5" { GoToTab 5; SwitchToMode "Normal"; }
+            bind "F6" { GoToTab 6; SwitchToMode "Normal"; }
+            bind "F7" { GoToTab 7; SwitchToMode "Normal"; }
+            bind "F8" { GoToTab 8; SwitchToMode "Normal"; }
+            bind "F9" { GoToTab 9; SwitchToMode "Normal"; }
+          }
           shared_except "pane" "locked" {
             bind "Ctrl b" { SwitchToMode "Pane"; }
           }