diff options
| author | Antonio Yang <yanganto@gmail.com> | 2020-10-09 23:32:58 +0800 |
|---|---|---|
| committer | Antonio Yang <yanganto@gmail.com> | 2020-10-17 10:48:31 +0800 |
| commit | 52b903b3c4bbdba141f0402774ab0f69f29dbfee (patch) | |
| tree | 9369025fd0003c3b8dc27e8dbdf0dc3ee3fbc5ff /nixos | |
| parent | d81e10c73584b0092d7fc021c691fdac2fd58db1 (diff) | |
| download | nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.tar nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.tar.gz nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.tar.bz2 nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.tar.lz nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.tar.xz nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.tar.zst nixpkgs-52b903b3c4bbdba141f0402774ab0f69f29dbfee.zip | |
hime: fix enable hime, remove hime-all package
- fix inputMethod.enable hime by adding module list - rm hime-all package, because chewing, anthy modules does not work well
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/i18n/input-method/default.xml | 4 | ||||
| -rw-r--r-- | nixos/modules/i18n/input-method/hime.nix | 18 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
3 files changed, 5 insertions, 18 deletions
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index e15f6669081..73911059f8a 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -252,8 +252,8 @@ i18n.inputMethod = { <para> Hime is an extremely easy-to-use input method framework. It is lightweight, stable, powerful and supports many commonly used input methods, including - Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Japanese Anthy, Korean Pinyin, - Latin Alphabet, Rancang hunting birds, cool music, etc... + Cangjie, Zhuyin, Dayi, Rank, Shrimp, Greek, Korean Pinyin, Latin Alphabet, + etc... </para> <para> diff --git a/nixos/modules/i18n/input-method/hime.nix b/nixos/modules/i18n/input-method/hime.nix index a1b346a0f84..8482130db3e 100644 --- a/nixos/modules/i18n/input-method/hime.nix +++ b/nixos/modules/i18n/input-method/hime.nix @@ -1,23 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; { - options = { - i18n.inputMethod.hime = { - enableChewing = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable chewing input method"; - }; - enableAnthy = mkOption { - type = with types; nullOr bool; - default = null; - description = "enable anthy input method"; - }; - }; - }; - config = mkIf (config.i18n.inputMethod.enabled == "hime") { + i18n.inputMethod.package = pkgs.hime; environment.variables = { GTK_IM_MODULE = "hime"; QT_IM_MODULE = "hime"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 39f28773eab..0958e561243 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -79,6 +79,7 @@ ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix + ./i18n/input-method/hime.nix ./i18n/input-method/ibus.nix ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix |