voronind/nix
0
0
Fork 0
Code Issues 40 Pull requests Packages Projects Releases Wiki Activity

Locale : Remove ru extras.

Browse source
This commit is contained in:
Dmitry Voronin 2024-04-02 15:45:40 +03:00
parent 495f0261cc
commit 050deac529
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
module/common/Locale.nix
View file

@ -1,15 +1,15 @@
{ const, ... }: { { const, ... }: {
time.timeZone = const.timeZone; time.timeZone = const.timeZone;
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { # i18n.extraLocaleSettings = {
LC_ADDRESS = "ru_RU.UTF-8"; # LC_ADDRESS = "ru_RU.UTF-8";
LC_IDENTIFICATION = "ru_RU.UTF-8"; # LC_IDENTIFICATION = "ru_RU.UTF-8";
LC_MEASUREMENT = "ru_RU.UTF-8"; # LC_MEASUREMENT = "ru_RU.UTF-8";
LC_MONETARY = "ru_RU.UTF-8"; # LC_MONETARY = "ru_RU.UTF-8";
LC_NAME = "ru_RU.UTF-8"; # LC_NAME = "ru_RU.UTF-8";
LC_NUMERIC = "ru_RU.UTF-8"; # LC_NUMERIC = "ru_RU.UTF-8";
LC_PAPER = "ru_RU.UTF-8"; # LC_PAPER = "ru_RU.UTF-8";
LC_TELEPHONE = "ru_RU.UTF-8"; # LC_TELEPHONE = "ru_RU.UTF-8";
LC_TIME = "ru_RU.UTF-8"; # LC_TIME = "ru_RU.UTF-8";
}; # };
} }

5
module/common/tmux/Script.sh
View file

@ -82,7 +82,7 @@ function _tmux_statusbar() {
echo -n " " echo -n " "
# Assemble. # Assemble.
if $(cat "/tmp/.tmux_uber" || echo false); then if $(cat "/tmp/.tmux_uber"); then
local lang=($(_tmux_language)) local lang=($(_tmux_language))
[[ "${lang[0]}" != "" ]] && { [[ "${lang[0]}" != "" ]] && {
echo -n "${lang[0]} ${sep} " echo -n "${lang[0]} ${sep} "
@ -108,9 +108,8 @@ function _tmux_statusbar() {
function _tmux_language() { function _tmux_language() {
local IFS=$'\n' local IFS=$'\n'
local lang=$(swaymsg -t get_inputs | jq 'map(select(has("xkb_active_layout_name")))[0].xkb_active_layout_name') local lang=$(swaymsg -t get_inputs | jq 'map(select(has("xkb_active_layout_name")))[0].xkb_active_layout_name')
local result=${lang:1:2}
echo -n ${result^^} echo -n ${lang:1:2}
} }
function _tmux_client_count() { function _tmux_client_count() {