Compare commits

..

No commits in common. "39e87b03495a2ec0a1840ee63946463f97b4255e" and "e965d9384218aebd1e80a5cd077d0b99b005d04e" have entirely different histories.

5 changed files with 16 additions and 35 deletions

View File

@ -154,12 +154,6 @@
LC_MONETARY = "ru_RU.UTF-8"; LC_MONETARY = "ru_RU.UTF-8";
LC_PAPER = "ru_RU.UTF-8"; LC_PAPER = "ru_RU.UTF-8";
}; };
i18n.supportedLocales = [
"C.UTF-8/UTF-8"
"en_US.UTF-8/UTF-8"
"ru_RU.UTF-8/UTF-8"
"en_GB.UTF-8/UTF-8"
];
time.timeZone = "Europe/Helsinki"; time.timeZone = "Europe/Helsinki";
environment.sessionVariables = { environment.sessionVariables = {
XKB_DEFAULT_LAYOUT = "us,ru"; XKB_DEFAULT_LAYOUT = "us,ru";

View File

@ -41,20 +41,13 @@ in {
allowedTCPPorts = [ blockyPort grafanaPort ]; allowedTCPPorts = [ blockyPort grafanaPort ];
allowedUDPPorts = [ blockyPort ]; allowedUDPPorts = [ blockyPort ];
}; };
hosts = {
"192.168.0.10" = [ "wg.ataraxiadev.com" ];
};
}; };
# ephemeral tailscale node # ephemeral tailscale node
services.tailscale = { services.tailscale = {
enable = true; enable = true;
useRoutingFeatures = "client"; useRoutingFeatures = "client";
authKeyFile = "/tmp/blocky-authkey"; authKeyFile = "/tmp/blocky-authkey";
extraUpFlags = [ extraUpFlags = [ "--login-server=https://wg.ataraxiadev.com" "--accept-dns=false" ];
"--login-server=https://wg.ataraxiadev.com"
"--accept-dns=false"
"--advertise-exit-node=false"
];
}; };
systemd.services.tailscaled.serviceConfig.Environment = let systemd.services.tailscaled.serviceConfig.Environment = let
cfg = config.services.tailscale; cfg = config.services.tailscale;

View File

@ -1,29 +1,20 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let with config.deviceSpecific; {
en = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
ru = "ru_RU.UTF-8";
in {
i18n.defaultLocale = en;
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
LANGUAGE = en; LANGUAGE = "en_US.UTF-8";
LC_ALL = en; LC_ALL = "en_US.UTF-8";
LC_TIME = en; LC_TIME = "en_US.UTF-8";
LC_ADDRESS = ru; LC_ADDRESS = "ru_RU.UTF-8";
LC_MONETARY = ru; LC_MONETARY = "ru_RU.UTF-8";
LC_PAPER = ru; LC_PAPER = "ru_RU.UTF-8";
}; };
i18n.supportedLocales = [
"C.UTF-8/UTF-8"
"en_US.UTF-8/UTF-8"
"en_GB.UTF-8/UTF-8"
"ru_RU.UTF-8/UTF-8"
];
environment.sessionVariables = { environment.sessionVariables = {
XKB_DEFAULT_LAYOUT = "us,ru"; XKB_DEFAULT_LAYOUT = "us,ru";
XKB_DEFAULT_OPTIONS = "grp:win_space_toggle"; XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
LANGUAGE = en; LANGUAGE = "en_US.UTF-8";
LC_ALL = en; LC_ALL = "en_US.UTF-8";
}; };
time.timeZone = "Europe/Moscow"; time.timeZone = "Europe/Moscow";
@ -35,7 +26,10 @@ in {
}; };
home-manager.users.${config.mainuser} = { home-manager.users.${config.mainuser} = {
home.language = { home.language = let
en = "en_US.UTF-8";
ru = "ru_RU.UTF-8";
in {
address = ru; address = ru;
monetary = ru; monetary = ru;
paper = ru; paper = ru;

View File

@ -17,6 +17,7 @@
user user
ssh ssh
vlock vlock
vpn
zsh zsh
]; ];
} }

View File

@ -19,7 +19,6 @@
ssh ssh
user user
vlock vlock
vpn
zsh zsh
]; ];
} }