diff --git a/profiles/servers/nginx.nix b/profiles/servers/nginx.nix index 35f721f..c124a3f 100644 --- a/profiles/servers/nginx.nix +++ b/profiles/servers/nginx.nix @@ -234,8 +234,8 @@ proxy_set_header X-Forwarded-Server $host; client_max_body_size 40M; ''; - } // default; - }; + }; + } // default; }; }; diff --git a/profiles/workspace/locale.nix b/profiles/workspace/locale.nix index aefc8a7..88bc44c 100644 --- a/profiles/workspace/locale.nix +++ b/profiles/workspace/locale.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: with config.deviceSpecific; { - i18n.defaultLocale = "en_GB.UTF-8"; + i18n.defaultLocale = "en_GB.utf8"; console.font = "cyr-sun16"; console.keyMap = "ruwin_cplk-UTF-8"; @@ -8,7 +8,7 @@ with config.deviceSpecific; { environment.sessionVariables = { XKB_DEFAULT_LAYOUT = "us,ru"; XKB_DEFAULT_OPTIONS = "grp:win_space_toggle"; - LANG = lib.mkForce "en_GB.UTF-8"; + LANG = lib.mkForce "en_GB.utf8"; }; time.timeZone = "Europe/Moscow"; @@ -21,8 +21,8 @@ with config.deviceSpecific; { home-manager.users.alukard = { home.language = let - en = "en_GB.UTF-8"; - ru = "ru_RU.UTF-8"; + en = "en_GB.utf8"; + ru = "ru_RU.utf8"; in { address = ru; monetary = ru;