From 2d4e9a5abfc08386250f42ba0f0c25ae63073d3e Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 10 Jun 2023 22:21:25 +0300
Subject: 2023-06-10

---
 modules/nixos/common/locale.nix | 26 +++++++++++++++-----------
 modules/nixos/common/nix.nix    |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'modules/nixos/common')

diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix
index 7529996..09e0686 100644
--- a/modules/nixos/common/locale.nix
+++ b/modules/nixos/common/locale.nix
@@ -1,4 +1,8 @@
-{lib, ...}:
+{
+  lib,
+  pkgs,
+  ...
+}:
 with lib; {
   i18n = {
     defaultLocale = mkDefault "en_GB.UTF-8";
@@ -9,22 +13,22 @@ with lib; {
       "ja_JP.UTF-8/UTF-8"
       "ru_RU.UTF-8/UTF-8"
     ];
+
+    inputMethod = {
+      enabled = "fcitx5";
+      fcitx5.addons = with pkgs; [
+        fcitx5-configtool
+        fcitx5-mozc
+      ];
+    };
   };
 
   services.xserver = {
-    layout = concatStringsSep "," [
-      "us"
-      "ru"
-    ];
-    xkbVariant = concatStringsSep "," [
-      ""
-      "phonetic"
-    ];
+    layout = "us";
     xkbOptions = concatStringsSep "," [
-      "terminate:ctrl_alt_bksp"
       "caps:escape"
       "compose:menu"
-      "grp:win_space_toggle"
+      "terminate:ctrl_alt_bksp"
     ];
   };
 }
diff --git a/modules/nixos/common/nix.nix b/modules/nixos/common/nix.nix
index 410e01d..9978513 100644
--- a/modules/nixos/common/nix.nix
+++ b/modules/nixos/common/nix.nix
@@ -19,7 +19,7 @@ in {
 
       overlays = with inputs; [
         nix-minecraft.overlay
-        pollymc.overlay
+        pollymc.overlays.default
         xmonad-ng.overlays.default
       ];
     };
-- 
cgit 1.4.1