fix i18n
This commit is contained in:
parent
5afa8b4381
commit
228605fd02
6 changed files with 26 additions and 11 deletions
|
|
@ -52,7 +52,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
i18n.inputMethod.enable = lib.mkForce false;
|
|
||||||
system.stateVersion = "25.11";
|
system.stateVersion = "25.11";
|
||||||
networking.hostName = "apollo";
|
networking.hostName = "apollo";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
hardware.systemd-boot.enable = false; # SD card uses extlinux
|
hardware.systemd-boot.enable = false; # SD card uses extlinux
|
||||||
};
|
};
|
||||||
|
|
||||||
i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method
|
|
||||||
|
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
hardware.systemd-boot.enable = false; # Uses extlinux bootloader
|
hardware.systemd-boot.enable = false; # Uses extlinux bootloader
|
||||||
};
|
};
|
||||||
|
|
||||||
i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method
|
|
||||||
|
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
|
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method
|
|
||||||
|
|
||||||
networking.hostName = "pochita";
|
networking.hostName = "pochita";
|
||||||
# log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName"
|
# log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName"
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
services.cloudflared.enable = true;
|
services.cloudflared.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
i18n.inputMethod.enable = lib.mkForce false;
|
|
||||||
networking.hostName = "wallfacer";
|
networking.hostName = "wallfacer";
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,17 @@
|
||||||
{ lib, config, ... }:
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
{
|
{
|
||||||
config = lib.mkIf config.osbmModules.i18n.enable {
|
config = lib.mkIf config.osbmModules.i18n.enable {
|
||||||
# Set your time zone
|
time.timeZone = "Europe/Istanbul";
|
||||||
time.timeZone = lib.mkDefault "Europe/Istanbul";
|
|
||||||
|
|
||||||
# Select internationalisation properties
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
i18n.extraLocaleSettings = lib.mkDefault {
|
i18n.extraLocaleSettings = {
|
||||||
LC_ADDRESS = "tr_TR.UTF-8";
|
LC_ADDRESS = "tr_TR.UTF-8";
|
||||||
LC_IDENTIFICATION = "tr_TR.UTF-8";
|
LC_IDENTIFICATION = "tr_TR.UTF-8";
|
||||||
LC_MEASUREMENT = "tr_TR.UTF-8";
|
LC_MEASUREMENT = "tr_TR.UTF-8";
|
||||||
|
|
@ -17,6 +21,22 @@
|
||||||
LC_PAPER = "tr_TR.UTF-8";
|
LC_PAPER = "tr_TR.UTF-8";
|
||||||
LC_TELEPHONE = "tr_TR.UTF-8";
|
LC_TELEPHONE = "tr_TR.UTF-8";
|
||||||
LC_TIME = "ja_JP.UTF-8";
|
LC_TIME = "ja_JP.UTF-8";
|
||||||
|
# LC_ALL = "en_US.UTF-8";
|
||||||
|
};
|
||||||
|
|
||||||
|
services.xserver.xkb = {
|
||||||
|
layout = "us";
|
||||||
|
variant = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
i18n.inputMethod = {
|
||||||
|
type = "fcitx5";
|
||||||
|
enable = config.osbmModules.desktopEnvironment != "none";
|
||||||
|
fcitx5.addons = with pkgs; [
|
||||||
|
fcitx5-mozc
|
||||||
|
fcitx5-gtk
|
||||||
|
fcitx5-nord # a color theme
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue