commit bcc7eff2c580649de8f8c92faf0fc64141f7f026 · pyrox.dev/nixpkgs

+2 -1

doc/packages/ibus.section.md

···

       11
       11
        
       ```nix

     

       12
       12
        
       { pkgs, ... }: {

     

       13
       13
        
         i18n.inputMethod = {

     

       14
       14
       -
           enabled = "ibus";

     

       14
       14
       +
           enable = true;

     

       15
       15
       +
           type = "ibus";

     

       15
       16
        
           ibus.engines = with pkgs.ibus-engines; [ typing-booster ];

     

       16
       17
        
         };

     

       17
       18
        
       }

+3

nixos/doc/manual/release-notes/rl-2411.section.md

···

       215
       215
        
         The derivation now installs "impl" headers selectively instead of by a wildcard.

     

       216
       216
        
         Use `imgui.src` if you just want to access the unpacked sources.

     

       217
       217
        
       

     

       218
       218
       +
       - The `i18n.inputMethod` module introduces two new properties:

     

       219
       219
       +
         `enable` and `type`, for declaring whether to enable an alternative input method and defining which input method respectfully. The options available in `type` are the same as the existing `enabled` option. `enabled` is now deprecated, and will be removed in a future release.

     

       220
       220
       +
       

     

       218
       221
        
       - `security.pam.u2f` now follows RFC42.

     

       219
       222
        
         All module options are now settable through the freeform `.settings`.

     

       220
       223

+12 -6

nixos/modules/i18n/input-method/default.md

···

       25
       25
        
       ```nix

     

       26
       26
        
       {

     

       27
       27
        
         i18n.inputMethod = {

     

       28
       28
       -
           enabled = "ibus";

     

       28
       28
       +
           enable = true;

     

       29
       29
       +
           type = "ibus";

     

       29
       30
        
           ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ];

     

       30
       31
        
         };

     

       31
       32
        
       }

     
···

       81
       82
        
       ```nix

     

       82
       83
        
       {

     

       83
       84
        
         i18n.inputMethod = {

     

       84
       84
       -
           enabled = "fcitx5";

     

       85
       85
       +
           enable = true;

     

       86
       86
       +
           type = "fcitx5";

     

       85
       87
        
           fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-hangul fcitx5-m17n ];

     

       86
       88
        
         };

     

       87
       89
        
       }

     
···

       119
       121
        
       ```nix

     

       120
       122
        
       {

     

       121
       123
        
         i18n.inputMethod = {

     

       122
       122
       -
           enabled = "nabi";

     

       124
       124
       +
           enable = true;

     

       125
       125
       +
           type = "nabi";

     

       123
       126
        
         };

     

       124
       127
        
       }

     

       125
       128
        
       ```

     
···

       134
       137
        
       ```nix

     

       135
       138
        
       {

     

       136
       139
        
         i18n.inputMethod = {

     

       137
       137
       -
           enabled = "uim";

     

       140
       140
       +
           enable = true;

     

       141
       141
       +
           type = "uim";

     

       138
       142
        
         };

     

       139
       143
        
       }

     

       140
       144
        
       ```

     
···

       154
       158
        
       ```nix

     

       155
       159
        
       {

     

       156
       160
        
         i18n.inputMethod = {

     

       157
       157
       -
           enabled = "hime";

     

       161
       161
       +
           enable = true;

     

       162
       162
       +
           type = "hime";

     

       158
       163
        
         };

     

       159
       164
        
       }

     

       160
       165
        
       ```

     
···

       168
       173
        
       ```nix

     

       169
       174
        
       {

     

       170
       175
        
         i18n.inputMethod = {

     

       171
       171
       -
           enabled = "kime";

     

       176
       176
       +
           enable = true;

     

       177
       177
       +
           type = "kime";

     

       172
       178
        
         };

     

       173
       179
        
       }

     

       174
       180
        
       ```

+18 -2

nixos/modules/i18n/input-method/default.nix

···

       4
       4
        
       let

     

       5
       5
        
         cfg = config.i18n.inputMethod;

     

       6
       6
        
       

     

       7
       7
       +
         allowedTypes = types.enum [ "ibus" "fcitx5" "nabi" "uim" "hime" "kime" ];

     

       8
       8
       +
       

     

       7
       9
        
         gtk2_cache = pkgs.runCommand "gtk2-immodule.cache"

     

       8
       10
        
           { preferLocalBuild = true;

     

       9
       11
        
             allowSubstitutes = false;

     
···

       28
       30
        
       {

     

       29
       31
        
         options.i18n = {

     

       30
       32
        
           inputMethod = {

     

       33
       33
       +
             enable = mkEnableOption "an additional input method type" // {

     

       34
       34
       +
               default = cfg.enabled != null;

     

       35
       35
       +
               defaultText = literalMD "`true` if the deprecated option `enabled` is set, false otherwise";

     

       36
       36
       +
             };

     

       37
       37
       +
       

     

       31
       38
        
             enabled = mkOption {

     

       32
       32
       -
               type    = types.nullOr (types.enum [ "ibus" "fcitx5" "nabi" "uim" "hime" "kime" ]);

     

       39
       39
       +
               type    = types.nullOr allowedTypes;

     

       33
       40
        
               default = null;

     

       34
       41
        
               example = "fcitx5";

     

       42
       42
       +
               description = "Deprecated - use `type` and `enable = true` instead";

     

       43
       43
       +
             };

     

       44
       44
       +
       

     

       45
       45
       +
             type = mkOption {

     

       46
       46
       +
               type    = types.nullOr allowedTypes;

     

       47
       47
       +
               default = cfg.enabled;

     

       48
       48
       +
               defaultText = literalMD "The value of the deprecated option `enabled`, defaulting to null";

     

       49
       49
       +
               example = "fcitx5";

     

       35
       50
        
               description = ''

     

       36
       51
        
                 Select the enabled input method. Input methods is a software to input symbols that are not available on standard input devices.

     

       37
       52
        
       

     
···

       59
       74
        
           };

     

       60
       75
        
         };

     

       61
       76
        
       

     

       62
       62
       -
         config = mkIf (cfg.enabled != null) {

     

       77
       77
       +
         config = mkIf cfg.enable {

     

       78
       78
       +
           warnings = optional (cfg.enabled != null) "i18n.inputMethod.enabled will be removed in a future release. Please use .type, and .enable = true instead";

     

       63
       79
        
           environment.systemPackages = [ cfg.package gtk2_cache gtk3_cache ];

     

       64
       80
        
         };

     

       65
       81

+3 -3

nixos/modules/i18n/input-method/fcitx5.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         im = config.i18n.inputMethod;

     

       7
       7
       -
         cfg = im.fcitx5;

     

       6
       6
       +
         imcfg = config.i18n.inputMethod;

     

       7
       7
       +
         cfg = imcfg.fcitx5;

     

       8
       8
        
         fcitx5Package =

     

       9
       9
        
           if cfg.plasma6Support

     

       10
       10
        
           then pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; }

     
···

       108
       108
        
           '')

     

       109
       109
        
         ];

     

       110
       110
        
       

     

       111
       111
       -
         config = mkIf (im.enabled == "fcitx5") {

     

       111
       111
       +
         config = mkIf (imcfg.enable && imcfg.type == "fcitx5") {

     

       112
       112
        
           i18n.inputMethod.package = fcitx5Package;

     

       113
       113
        
       

     

       114
       114
        
           i18n.inputMethod.fcitx5.addons = lib.optionals (cfg.quickPhrase != { }) [

+5 -1

nixos/modules/i18n/input-method/hime.nix

···

       1
       1
        
       { config, pkgs, lib, ... }:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         imcfg = config.i18n.inputMethod;

     

       7
       7
       +
       in

     

       4
       8
        
       {

     

       5
       5
       -
         config = mkIf (config.i18n.inputMethod.enabled == "hime") {

     

       9
       9
       +
         config = mkIf (imcfg.enable && imcfg.type == "hime") {

     

       6
       10
        
           i18n.inputMethod.package = pkgs.hime;

     

       7
       11
        
           environment.variables = {

     

       8
       12
        
             GTK_IM_MODULE = "hime";

+3 -2

nixos/modules/i18n/input-method/ibus.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.i18n.inputMethod.ibus;

     

       6
       6
       +
         imcfg = config.i18n.inputMethod;

     

       7
       7
       +
         cfg = imcfg.ibus;

     

       7
       8
        
         ibusPackage = pkgs.ibus-with-plugins.override { plugins = cfg.engines; };

     

       8
       9
        
         ibusEngine = types.package // {

     

       9
       10
        
           name  = "ibus-engine";

     
···

       52
       53
        
           };

     

       53
       54
        
         };

     

       54
       55
        
       

     

       55
       55
       -
         config = mkIf (config.i18n.inputMethod.enabled == "ibus") {

     

       56
       56
       +
         config = mkIf (imcfg.enable && imcfg.type == "ibus") {

     

       56
       57
        
           i18n.inputMethod.package = ibusPackage;

     

       57
       58
        
       

     

       58
       59
        
           environment.systemPackages = [

+3 -2

nixos/modules/i18n/input-method/kime.nix

···

       1
       1
        
       { config, pkgs, lib, generators, ... }:

     

       2
       2
       -
       let imcfg = config.i18n.inputMethod;

     

       2
       2
       +
       let

     

       3
       3
       +
         imcfg = config.i18n.inputMethod;

     

       3
       4
        
       in {

     

       4
       5
        
         imports = [

     

       5
       6
        
           (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "kime" "config" ] "Use i18n.inputMethod.kime.* instead")

     
···

       31
       32
        
           };

     

       32
       33
        
         };

     

       33
       34
        
       

     

       34
       34
       -
         config = lib.mkIf (imcfg.enabled == "kime") {

     

       35
       35
       +
         config = lib.mkIf (imcfg.enable && imcfg.type == "kime") {

     

       35
       36
        
           i18n.inputMethod.package = pkgs.kime;

     

       36
       37
        
       

     

       37
       38
        
           environment.variables = {

+4 -1

nixos/modules/i18n/input-method/nabi.nix

···

       1
       1
        
       { config, pkgs, lib, ... }:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         imcfg = config.i18n.inputMethod;

     

       6
       6
       +
       in

     

       4
       7
        
       {

     

       5
       5
       -
         config = mkIf (config.i18n.inputMethod.enabled == "nabi") {

     

       8
       8
       +
         config = mkIf (imcfg.enable && imcfg.type == "nabi") {

     

       6
       9
        
           i18n.inputMethod.package = pkgs.nabi;

     

       7
       10
        
       

     

       8
       11
        
           environment.variables = {

+3 -2

nixos/modules/i18n/input-method/uim.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.i18n.inputMethod.uim;

     

       6
       6
       +
         imcfg = config.i18n.inputMethod;

     

       7
       7
       +
         cfg = imcfg.uim;

     

       7
       8
        
       in

     

       8
       9
        
       {

     

       9
       10
        
         options = {

     
···

       21
       22
        
       

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       24
       -
         config = mkIf (config.i18n.inputMethod.enabled == "uim") {

     

       25
       25
       +
         config = mkIf (imcfg.enable && imcfg.type == "uim") {

     

       25
       26
        
           i18n.inputMethod.package = pkgs.uim;

     

       26
       27
        
       

     

       27
       28
        
           environment.variables = {

+4 -1

nixos/tests/installed-tests/ibus.nix

···

       5
       5
        
       

     

       6
       6
        
         testConfig = {

     

       7
       7
        
           i18n.supportedLocales = [ "all" ];

     

       8
       8
       -
           i18n.inputMethod.enabled = "ibus";

     

       8
       8
       +
           i18n.inputMethod = {

     

       9
       9
       +
             enable = true;

     

       10
       10
       +
             type = "ibus";

     

       11
       11
       +
           };

     

       9
       12
        
           systemd.user.services.ibus-daemon = {

     

       10
       13
        
             serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose";

     

       11
       14
        
             wantedBy = [ "graphical-session.target" ];