Skip to content

Commit

Permalink
im/fcitx: drop as fcitx 4 has been removed from nixpkgs (nix-communit…
Browse files Browse the repository at this point in the history
  • Loading branch information
NickCao authored and Eric Dattore committed Mar 29, 2023
1 parent 83110c2 commit 755e49f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 61 deletions.
18 changes: 7 additions & 11 deletions modules/i18n/input-method/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ let
'';

in {
imports =
[ ./fcitx.nix ./fcitx5.nix ./hime.nix ./kime.nix ./nabi.nix ./uim.nix ];
imports = [ ./fcitx5.nix ./hime.nix ./kime.nix ./nabi.nix ./uim.nix ];

options.i18n = {
inputMethod = {
enabled = mkOption {
type = types.nullOr
(types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]);
default = null;
example = "fcitx";
example = "fcitx5";
description = ''
Select the enabled input method. Input methods is a software to input
symbols that are not available on standard input devices.
Expand All @@ -42,17 +41,10 @@ in {
Currently the following input methods are available in Home Manager:
<variablelist>
<varlistentry>
<term><literal>fcitx</literal></term>
<listitem><para>
A customizable lightweight input method
extra input engines can be added using
<literal>i18n.inputMethod.fcitx.engines</literal>.
</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>fcitx5</literal></term>
<listitem><para>
A customizable lightweight input method.
The next generation of fcitx,
addons (including engines, dictionaries, skins) can be added using
<literal>i18n.inputMethod.fcitx5.addons</literal>.
Expand Down Expand Up @@ -97,6 +89,10 @@ in {
config = mkIf (cfg.enabled != null) {
assertions = [
(hm.assertions.assertPlatform "i18n.inputMethod" pkgs platforms.linux)
{
assertion = cfg.enabled != "fcitx";
message = "fcitx has been removed, please use fcitx5 instead";
}
];

home.packages = [ cfg.package gtk2Cache gtk3Cache ];
Expand Down
50 changes: 0 additions & 50 deletions modules/i18n/input-method/fcitx.nix

This file was deleted.

0 comments on commit 755e49f

Please sign in to comment.