From c9c6423bb3dc1bcd1aaaeda5f9b3bd9b3265d348 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Wed, 4 Sep 2024 17:00:12 +0200
Subject: [PATCH] fcitx5 + katana

---
 configuration.nix         | 39 +++++++++++++++++++--------------------
 system-modules/fcitx5.nix | 28 ++++++++++++++++++++++++++++
 system-modules/kanata.nix | 16 ++++++++++++++++
 3 files changed, 63 insertions(+), 20 deletions(-)
 create mode 100644 system-modules/fcitx5.nix
 create mode 100644 system-modules/kanata.nix

diff --git a/configuration.nix b/configuration.nix
index cc8ea9f..f3bcf9d 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -3,30 +3,31 @@
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./system-modules/auto-mount.nix
-    ./system-modules/hardware-configuration.nix
-    ./system-modules/fuse.nix
-    ./system-modules/nvidia.nix 
-    ./system-modules/users.nix
-    ./system-modules/sound.nix
-    ./system-modules/fonts.nix
     ./system-modules/boot.nix
-    ./system-modules/gc.nix
     ./system-modules/dm.nix
-    ./system-modules/networking.nix
-    ./system-modules/virtualisation.nix
-    ./system-modules/sshd.nix
-    ./system-modules/gpg.nix
-    ./system-modules/sops.nix
-    ./system-modules/syncthing.nix
-    ./system-modules/hsmw.nix
     ./system-modules/docker.nix
+    ./system-modules/fcitx5.nix
+    ./system-modules/fonts.nix
+    ./system-modules/fuse.nix
+    ./system-modules/gc.nix
+    ./system-modules/gpg.nix
+    ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
-    ./system-modules/ydotool.nix
-    ./system-modules/ollama.nix
-    ./system-modules/nx2site.nix
+    ./system-modules/hsmw.nix
+    ./system-modules/kanata.nix
     ./system-modules/kodi.nix
+    ./system-modules/networking.nix
+    ./system-modules/nvidia.nix 
+    ./system-modules/nx2site.nix
+    ./system-modules/ollama.nix
     ./system-modules/qmk.nix
-  ];
+    ./system-modules/sops.nix
+    ./system-modules/sound.nix
+    ./system-modules/sshd.nix
+    ./system-modules/syncthing.nix
+    ./system-modules/users.nix
+    ./system-modules/virtualisation.nix
+    ./system-modules/ydotool.nix  ];
 
 
 
@@ -66,7 +67,6 @@
   environment.systemPackages = with pkgs; ([
     git
     lazygit # home-manager module is bugged
-    git-crypt
     wget
     curl
     zip
@@ -74,7 +74,6 @@
     p7zip
     unar
     nano
-    micro
     htop
     direnv
     openssl
diff --git a/system-modules/fcitx5.nix b/system-modules/fcitx5.nix
new file mode 100644
index 0000000..d254a9a
--- /dev/null
+++ b/system-modules/fcitx5.nix
@@ -0,0 +1,28 @@
+{ pkgs-unstable, ... }:
+{
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    # type = "fcitx5"; # for later than 24.05
+    # enable = true;
+    fcitx5 = {
+      waylandFrontend = true;
+      addons = with pkgs-unstable; [
+        rime-data
+        fcitx5-rime
+        fcitx5-gtk
+        fcitx5-chinese-addons
+        fcitx5-catppuccin
+      ];
+    };
+  };
+  services.xserver.desktopManager.runXdgAutostartIfNone = true;
+  environment.variables = {
+    GLFW_IM_MODULE = "fcitx";
+    GTK_IM_MODULE = "fcitx";
+    INPUT_METHOD = "fcitx";
+    XMODIFIERS = "@im=fcitx";
+    IMSETTINGS_MODULE = "fcitx";
+    QT_IM_MODULE = "fcitx";
+    SDL_IM_MODULE = "fcitx";
+  };
+}
diff --git a/system-modules/kanata.nix b/system-modules/kanata.nix
new file mode 100644
index 0000000..6347ff5
--- /dev/null
+++ b/system-modules/kanata.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+	services.kanata = {
+    enable = true;
+    package = pkgs.kanata;
+    keyboards.default.config = ''
+      (defsrc
+	      caps
+      )
+      (deflayer default
+        esc
+      )
+    '';
+  };
+}
+