refactor(installer): remove Russia mode

Author: TakuyaYagam1

Linux/NixOS/home/programs/packages.nix

@@ -11,9 +11,7 @@ let
   packageSets = import ../../lib/package-sets.nix {
     inherit lib pkgs pkgs-stable;
   };
-  home = packageSets.home {
-    inherit (mysetup.features) russiaMode;
-  };
+  home = packageSets.home { };
 in
 {
   config = lib.mkMerge [

Linux/NixOS/hosts/NixOS/host-vars.nix

@@ -38,7 +38,6 @@
     secureBoot = false;
     ctfTools = false;
     omnirouter = false;
-    russiaMode = false;
     observability = false;
   };
 

Linux/NixOS/lib/package-sets/home.nix

@@ -2,7 +2,6 @@
   lib,
   pkgs,
   pkgs-stable ? pkgs,
-  russiaMode ? false,
 }:
 
 let
@@ -31,20 +30,17 @@ let
   });
 in
 {
-  apiTools =
-    (with pkgs; [
-      yaak
-      insomnia
-      dbeaver-bin
-      sqlit-tui
-      ngrok
-      pkgs-stable.pgbadger
-      warp-terminal
-      termius
-    ])
-    ++ lib.optionals (!russiaMode) [
-      pkgs.jetbrains.datagrip
-    ];
+  apiTools = with pkgs; [
+    yaak
+    insomnia
+    dbeaver-bin
+    sqlit-tui
+    ngrok
+    pkgs-stable.pgbadger
+    warp-terminal
+    termius
+    jetbrains.datagrip
+  ];
   containers = with pkgs-stable; [
     podman-desktop
   ];

Linux/NixOS/modules/mysetup-options.nix

@@ -78,11 +78,11 @@ let
       };
       features = mkOption {
         type = types.submodule {
+          freeformType = types.attrsOf types.bool;
           options = {
             secureBoot = boolOption false;
             ctfTools = boolOption false;
             omnirouter = boolOption false;
-            russiaMode = boolOption false;
             observability = boolOption false;
           };
         };

Linux/README.md

@@ -156,9 +156,7 @@ Secret files must be regular files, non-symlinks, and not group/world readable.
 
 - Host/user settings: hostname, username, full name, home directory.
 - Git identity: `user.name` and `user.email` for Home Manager Git config.
-- Region: timezone, locale, console keymap, weather location, Russia mode
-  (`mysetup.features.russiaMode` - when `true`, drops JetBrains products
-  such as `jetbrains.datagrip` from the home package set).
+- Locale/region fields: timezone, locale, console keymap, weather location.
 - Display: monitor name, mode, position, scale, Hypr keyboard layouts/toggle.
 - Package preset: `personal`, `developer`, `desktop`, or `minimal`.
 - Feature flags: GPU type, Secure Boot, CTF tools, OmniRouter.

Linux/installer/internal/apply/generate.go

@@ -145,7 +145,6 @@ var hostVarsTemplate = template.Must(template.New("host-vars.nix").Funcs(templat
     secureBoot = {{ nixBool .Features.SecureBoot }};
     ctfTools = {{ nixBool .Features.CTFTools }};
     omnirouter = {{ nixBool .Features.OmniRouter }};
-    russiaMode = {{ nixBool .Features.RussiaMode }};
     observability = {{ nixBool .Features.Observability }};
   };
 

Linux/installer/internal/config/state.go

@@ -102,7 +102,6 @@ type Features struct {
 	SecureBoot    bool `json:"secureBoot"`
 	CTFTools      bool `json:"ctfTools"`
 	OmniRouter    bool `json:"omniRouter"`
-	RussiaMode    bool `json:"russiaMode"`
 	Observability bool `json:"observability"`
 }
 type Zapret struct {

Linux/installer/internal/config/state_test.go

@@ -91,9 +91,6 @@ func TestDefaultFeatureAndDotsToggles(t *testing.T) {
 	if state.Features.SecureBoot {
 		t.Fatal("secure boot must be disabled by default")
 	}
-	if state.Features.RussiaMode {
-		t.Fatal("russia mode must be disabled by default")
-	}
 	if state.Zapret.Enable {
 		t.Fatal("zapret must be disabled by default")
 	}

Linux/installer/internal/tui/section_preview.go

@@ -61,7 +61,6 @@ func previewRegion(s config.State) []string {
 		previewSetting("Extra locale", "Additional generated locale for regional tools/input.", s.Locale.ExtraLocale),
 		previewSetting("Console keymap", "TTY keyboard map only. Default is us; Hypr graphical layouts are configured in Display.", s.Locale.ConsoleKeyMap),
 		previewSetting("Weather location", "City name used by shell/weather widgets.", s.Locale.WeatherLocation),
-		previewSetting("Russia mode", "Region-specific defaults in this config.", formatBool(s.Features.RussiaMode)),
 	)
 }
 

Linux/installer/internal/tui/tui_region.go

@@ -1,9 +1,5 @@
 package tui
 
-import (
-	"github.com/charmbracelet/huh"
-)
-
 func editRegion(s *session) error {
 	return newForm(
 		newBottomFilterSelect().
@@ -23,7 +19,7 @@ func editRegion(s *session) error {
 			Value(&s.state.Locale.DefaultLocale),
 		newBottomFilterSelect().
 			Title("Extra locale").
-			Description("Additional generated locale, usually ru_RU.UTF-8 for Russian input/tools.").
+			Description("Additional generated locale for regional input/tools.").
 			Options(localeOptions(s.state.Locale.ExtraLocale)...).
 			Height(12).
 			Value(&s.state.Locale.ExtraLocale),
@@ -37,9 +33,5 @@ func editRegion(s *session) error {
 			Title("Weather location").
 			Description("City name used by shell/weather widgets if enabled.").
 			Value(&s.state.Locale.WeatherLocation),
-		huh.NewConfirm().
-			Title("Russia mode").
-			Description("Enables region-specific defaults in this config. VPN/proxy services are separate.").
-			Value(&s.state.Features.RussiaMode),
 	).Run()
 }