From 56f1f839e559a771f7c7c940fc82b1ca74dc030e Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Tue, 28 May 2024 17:38:59 -0700
Subject: Add Japanese input

---
 system/default.nix  |  2 +-
 system/keyboard.nix | 33 +++++++++++++++++++++++++++++++++
 system/keyd.nix     | 23 -----------------------
 3 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 system/keyboard.nix
 delete mode 100644 system/keyd.nix

(limited to 'system')

diff --git a/system/default.nix b/system/default.nix
index ca5412c..6178ae8 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./fonts.nix
-    ./keyd.nix
+    ./keyboard.nix
     ./networking.nix
     ./pipewire.nix
     ./xserver.nix
diff --git a/system/keyboard.nix b/system/keyboard.nix
new file mode 100644
index 0000000..4a8bd25
--- /dev/null
+++ b/system/keyboard.nix
@@ -0,0 +1,33 @@
+{ ... }:
+
+{
+  services.keyd = {
+    enable = true;
+
+    keyboards."*".settings = {
+      main = {
+        # Swap alt and meta keys.
+        # I prefer (physical) alt as my WM modifier key because it
+        #   is easier to reach. This can collide with some programs
+        #   shortcuts if they inlcude alt. Swapping alt and meta fixes
+        #   this by making my WM mod key (software) meta, freeing up alt.
+
+        leftalt = "leftmeta";
+        leftmeta = "leftalt";
+
+        rightalt = "rightmeta";
+        rightmeta = "rightalt";
+      };
+    };
+  };
+
+  i18n.inputMethod = { 
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [ fcitx5-mozc ];
+  };
+
+  environment.variables = {
+    # Required for fcitx5 support in kitty
+    GLFW_IM_MODULE = "ibus";
+  };
+}
diff --git a/system/keyd.nix b/system/keyd.nix
deleted file mode 100644
index d1d7086..0000000
--- a/system/keyd.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-
-{
-  services.keyd = {
-    enable = true;
-
-    keyboards."*".settings = {
-      main = {
-        # Swap alt and meta keys.
-        # I prefer (physical) alt as my WM modifier key because it
-        #   is easier to reach. This can collide with some programs
-        #   shortcuts if they inlcude alt. Swapping alt and meta fixes
-        #   this by making my WM mod key (software) meta, freeing up alt.
-
-        leftalt = "leftmeta";
-        leftmeta = "leftalt";
-
-        rightalt = "rightmeta";
-        rightmeta = "rightalt";
-      };
-    };
-  };
-}
-- 
cgit v1.2.3