From 295602c99e0eb17a9d6f6f3209924ec6f56727ef Mon Sep 17 00:00:00 2001
From: "Alexandre Cavalheiro S. Tiago da Silva" <contact@thewizard.link>
Date: Thu, 11 Apr 2024 20:00:24 -0300
Subject: [PATCH] hyprland: stop using fcitx5

---
 programs/hyprland/default.nix      |  6 +++---
 programs/waybar.nix                | 19 +++++++++++++++++--
 scripts/hyprland/start_services.sh |  5 -----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/programs/hyprland/default.nix b/programs/hyprland/default.nix
index da62b90..3cd889c 100644
--- a/programs/hyprland/default.nix
+++ b/programs/hyprland/default.nix
@@ -99,10 +99,10 @@
 
       # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
       input {
-          kb_layout =
-          kb_variant =
+          kb_layout = us,br,jp
+          kb_variant = ,,kana86
           kb_model =
-          kb_options =
+          kb_options = grp:alts_toggle
           kb_rules =
 
           follow_mouse = 1
diff --git a/programs/waybar.nix b/programs/waybar.nix
index bfae1a2..14cb554 100644
--- a/programs/waybar.nix
+++ b/programs/waybar.nix
@@ -10,8 +10,15 @@
 
         modules-left = [ "hyprland/workspaces" ];
         modules-center = [ "clock" ];
-        modules-right =
-          [ "network" "memory" "cpu" "temperature" "battery" "tray" ];
+        modules-right = [
+          "network"
+          "memory"
+          "cpu"
+          "temperature"
+          "battery"
+          "hyprland/language"
+          "tray"
+        ];
 
         "hyprland/workspaces" = {
           format = "{icon}";
@@ -107,6 +114,14 @@
           tooltip = false;
         };
 
+        "hyprland/language" = {
+          format = "  {}";
+          format-en = "EN/US";
+          format-pt-br = "PT/BR";
+          #"on-click" = "hyprctl switchxkblayout www.hfd.cn-monsgeek-keyboard-1 next";
+          tooltip = false;
+        };
+
         tray = {
           icon-size = 18;
           spacing = 10;
diff --git a/scripts/hyprland/start_services.sh b/scripts/hyprland/start_services.sh
index af7e4e5..ccf927c 100755
--- a/scripts/hyprland/start_services.sh
+++ b/scripts/hyprland/start_services.sh
@@ -20,11 +20,6 @@ waybar &
 #
 xwaylandvideobridge &
 
-#
-# Start fcitx5
-#
-fcitx5 &
-
 #
 ## Start wallpaper daemon and set one.
 #