Merge branch 'update-locale-taiwan' into trunk

This commit is contained in:
Primrose 2025-08-21 15:16:18 +02:00
commit c0a47f98aa
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
2 changed files with 35 additions and 22 deletions

View file

@ -52,7 +52,7 @@ config =
, Run XMonadLog , Run XMonadLog
, Run $ , Run $
Weather Weather
"LFRN" "RCSS"
[ "-t", "<station>: <tempC>°C" [ "-t", "<station>: <tempC>°C"
, "-L","10", "-H", "25" , "-L","10", "-H", "25"
, "--normal", "white" , "--normal", "white"
@ -72,7 +72,7 @@ config =
, "<fc=#c9c9c9>[TPE: %tstClock%]</fc>" , "<fc=#c9c9c9>[TPE: %tstClock%]</fc>"
] ]
<> " " <> " "
, " %LFRN% " , " %RCSS% "
, " %battery%, %powerprofilesctl%) " , " %battery%, %powerprofilesctl%) "
, " %hereClock% (%tomorrow%) " , " %hereClock% (%tomorrow%) "
] ]

View file

@ -1,34 +1,47 @@
{ {lib, ...}: {
time.timeZone = "Europe/Paris"; # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# `timedatectl list-timezones`
time.timeZone = "Asia/Taipei";
i18n = { i18n = {
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";
supportedLocales = [ extraLocales = [
"en_US.UTF-8/UTF-8" "en_US.UTF-8/UTF-8"
"fr_FR.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8"
"zh_TW.UTF-8/UTF-8" "zh_TW.UTF-8/UTF-8"
]; ];
extraLocaleSettings = { extraLocaleSettings =
# LC_CTYPE = "en_US.UTF-8"; # A list of env variables you might want to set
# LC_NUMERIC = "en_US.UTF-8"; #
LC_TIME = "fr_FR.UTF-8"; # "LC_CTYPE"
# LC_COLLATE = "en_US.UTF-8"; # "LC_NUMERIC"
LC_MONETARY = "fr_FR.UTF-8"; # "LC_TIME"
# LC_MESSAGES = "en_US.UTF-8"; # "LC_COLLATE"
# LC_PAPER = "en_US.UTF-8"; # "LC_MONETARY"
# LC_NAME = "en_US.UTF-8"; # "LC_MESSAGES"
LC_ADDRESS = "fr_FR.UTF-8"; # "LC_PAPER"
# LC_TELEPHONE = "en_US.UTF-8"; # "LC_NAME"
# LC_MEASUREMENT = "en_US.UTF-8"; # "LC_ADDRESS"
# LC_IDENTIFICATION = "en_US.UTF-8"; # "LC_TELEPHONE"
# LC_ALL= # "LC_MEASUREMENT"
}; # "LC_IDENTIFICATION"
let
genLocale = locale: lib.flip lib.genAttrs (_: locale);
in
genLocale "zh_TW.UTF-8" [
"LC_TIME"
"LC_MONETARY"
"LC_ADDRESS"
];
}; };
# Wireless Regulatory Domain # Wireless Regulatory Domain, uses ISO / IEC 3166 country code
#
# links:
# https://community.frame.work/t/framework-nixos-linux-users-self-help/31426/77 # https://community.frame.work/t/framework-nixos-linux-users-self-help/31426/77
# https://wireless.docs.kernel.org/en/latest/en/developers/regulatory.html#the-ieee80211-regdom-module-parameter
hardware.wirelessRegulatoryDatabase = true; hardware.wirelessRegulatoryDatabase = true;
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options cfg80211 ieee80211_regdom="FR" options cfg80211 ieee80211_regdom="TW"
''; '';
} }