machines/NixOS-VPS/default.nix

@@ -154,12 +154,6 @@
     LC_MONETARY = "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";
   environment.sessionVariables = {
     XKB_DEFAULT_LAYOUT = "us,ru";

profiles/servers/blocky.nix

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

profiles/workspace/locale.nix

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

roles/base.nix

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

roles/hypervisor.nix

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