From e9de019d8dca89fe1ff3cbf57c1f293524581c5d Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Thu, 4 Nov 2021 17:42:12 +0100
Subject: [PATCH] i18n: Move module to services

---
 modules/default.nix                             | 2 +-
 modules/programs/sway/default.nix               | 5 ++++-
 modules/{programs => services}/i18n/default.nix | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename modules/{programs => services}/i18n/default.nix (95%)

diff --git a/modules/default.nix b/modules/default.nix
index 009ab70..96409e4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -14,7 +14,6 @@
     ./programs/firefox
     ./programs/gnome
     ./programs/gnome-terminal
-    ./programs/i18n # TODO: Move to toplevel
     ./programs/mpv
     ./programs/git
     ./programs/sway
@@ -28,6 +27,7 @@
     ./services/kanshi
     ./services/key-mapper
     ./services/gamemode
+    ./services/i18n
 
     # User
     #./users/default.nix
diff --git a/modules/programs/sway/default.nix b/modules/programs/sway/default.nix
index 70ed65a..18ae90d 100644
--- a/modules/programs/sway/default.nix
+++ b/modules/programs/sway/default.nix
@@ -51,7 +51,10 @@ in {
             { command = "${kanshiWrapper}"; always = true; }
             { command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; always = true; }
             { command = "${swayIdleWrapper}"; always = true; }
-          ];
+          ] ++ lib.optional config.ptw.system.i18n.enable {
+            command = "${pkgs.fcitx5}/bin/fcitx -d";
+            always = true;
+          };
           modifier = "${modifier}";
           gaps = {
             inner = 5;
diff --git a/modules/programs/i18n/default.nix b/modules/services/i18n/default.nix
similarity index 95%
rename from modules/programs/i18n/default.nix
rename to modules/services/i18n/default.nix
index 483d29b..804c1e5 100644
--- a/modules/programs/i18n/default.nix
+++ b/modules/services/i18n/default.nix
@@ -9,7 +9,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     i18n.inputMethod = {
-      enabled = "ibus";
+      enabled = "fcitx";
       ibus.engines = with pkgs.ibus-engines; [ mozc ];
     };