diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 89a95f3b356..7d26dd73a2b 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -58,7 +58,7 @@ let cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml cp ${../../modules/security/acme.xml} configuration/acme.xml - cp ${../../modules/i18n/inputMethod/default.xml} configuration/input-methods.xml + cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version ''; diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 1528c8a7246..620c3e362a6 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -63,11 +63,11 @@ has the following highlights: services/monitoring/longview.nix hardware/video/webcam/facetimehd.nix - i18n/inputMethod/default.nix - i18n/inputMethod/fcitx.nix - i18n/inputMethod/ibus.nix - i18n/inputMethod/nabi.nix - i18n/inputMethod/uim.nix + i18n/input-method/default.nix + i18n/input-method/fcitx.nix + i18n/input-method/ibus.nix + i18n/input-method/nabi.nix + i18n/input-method/uim.nix programs/fish.nix security/acme.nix security/audit.nix diff --git a/nixos/modules/i18n/inputMethod/default.nix b/nixos/modules/i18n/input-method/default.nix similarity index 100% rename from nixos/modules/i18n/inputMethod/default.nix rename to nixos/modules/i18n/input-method/default.nix diff --git a/nixos/modules/i18n/inputMethod/default.xml b/nixos/modules/i18n/input-method/default.xml similarity index 100% rename from nixos/modules/i18n/inputMethod/default.xml rename to nixos/modules/i18n/input-method/default.xml diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix similarity index 100% rename from nixos/modules/i18n/inputMethod/fcitx.nix rename to nixos/modules/i18n/input-method/fcitx.nix diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix similarity index 100% rename from nixos/modules/i18n/inputMethod/ibus.nix rename to nixos/modules/i18n/input-method/ibus.nix diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/input-method/nabi.nix similarity index 100% rename from nixos/modules/i18n/inputMethod/nabi.nix rename to nixos/modules/i18n/input-method/nabi.nix diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/input-method/uim.nix similarity index 100% rename from nixos/modules/i18n/inputMethod/uim.nix rename to nixos/modules/i18n/input-method/uim.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 65f0ea9b65d..a23e787bd08 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -41,11 +41,11 @@ ./hardware/video/nvidia.nix ./hardware/video/ati.nix ./hardware/video/webcam/facetimehd.nix - ./i18n/inputMethod/default.nix - ./i18n/inputMethod/fcitx.nix - ./i18n/inputMethod/ibus.nix - ./i18n/inputMethod/nabi.nix - ./i18n/inputMethod/uim.nix + ./i18n/input-method/default.nix + ./i18n/input-method/fcitx.nix + ./i18n/input-method/ibus.nix + ./i18n/input-method/nabi.nix + ./i18n/input-method/uim.nix ./installer/tools/auto-upgrade.nix ./installer/tools/nixos-checkout.nix ./installer/tools/tools.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 84eccfd5129..aaec13d6bea 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -63,7 +63,7 @@ with lib; (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]) # ibus - (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ]) + (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "input-method" "ibus" "engines" ]) # proxy (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ])