diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index 4af848c72015..7665b83e0f95 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -1,7 +1,4 @@ { config, pkgs, lib, ... }: - -with lib; - let imcfg = config.i18n.inputMethod; cfg = imcfg.ibus; @@ -9,10 +6,10 @@ let ibusEngine = lib.types.mkOptionType { name = "ibus-engine"; inherit (lib.types.package) descriptionClass merge; - check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x); + check = x: (lib.types.package.check x) && (lib.attrByPath ["meta" "isIbusEngine"] false x); }; - impanel = optionalString (cfg.panel != null) "--panel=${cfg.panel}"; + impanel = lib.optionalString (cfg.panel != null) "--panel=${cfg.panel}"; ibusAutostart = pkgs.writeTextFile { name = "autostart-ibus-daemon"; @@ -29,32 +26,32 @@ let in { imports = [ - (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ]) + (lib.mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ]) ]; options = { i18n.inputMethod.ibus = { - engines = mkOption { - type = with types; listOf ibusEngine; + engines = lib.mkOption { + type = with lib.types; listOf ibusEngine; default = []; - example = literalExpression "with pkgs.ibus-engines; [ mozc hangul ]"; + example = lib.literalExpression "with pkgs.ibus-engines; [ mozc hangul ]"; description = let - enginesDrv = filterAttrs (const isDerivation) pkgs.ibus-engines; - engines = concatStringsSep ", " - (map (name: "`${name}`") (attrNames enginesDrv)); + enginesDrv = lib.filterAttrs (lib.const lib.isDerivation) pkgs.ibus-engines; + engines = lib.concatStringsSep ", " + (map (name: "`${name}`") (lib.attrNames enginesDrv)); in "Enabled IBus engines. Available engines are: ${engines}."; }; - panel = mkOption { - type = with types; nullOr path; + panel = lib.mkOption { + type = with lib.types; nullOr path; default = null; - example = literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/libexec/kimpanel-ibus-panel"''; + example = lib.literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/libexec/kimpanel-ibus-panel"''; description = "Replace the IBus panel with another panel."; }; }; }; - config = mkIf (imcfg.enable && imcfg.type == "ibus") { + config = lib.mkIf (imcfg.enable && imcfg.type == "ibus") { i18n.inputMethod.package = ibusPackage; environment.systemPackages = [ @@ -76,7 +73,7 @@ in XMODIFIERS = "@im=ibus"; }; - xdg.portal.extraPortals = mkIf config.xdg.portal.enable [ + xdg.portal.extraPortals = lib.mkIf config.xdg.portal.enable [ ibusPackage ]; };