From 2a33d7cd974b57c0e69b0d4998e9bfe06af86b62 Mon Sep 17 00:00:00 2001
From: codefiles <11915375+codefiles@users.noreply.github.com>
Date: Sun, 10 Mar 2024 04:34:32 -0400
Subject: Set keyboard layout in minimal installation (#2399)

---
 archinstall/lib/installer.py         | 1 +
 archinstall/scripts/guided.py        | 4 ----
 archinstall/scripts/swiss.py         | 4 ----
 examples/interactive_installation.py | 4 ----
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 2b2af06e..41113899 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -714,6 +714,7 @@ class Installer:
 		# sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime')
 		self.set_hostname(hostname)
 		self.set_locale(locale_config)
+		self.set_keyboard_language(locale_config.kb_layout)
 
 		# TODO: Use python functions for this
 		SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root')
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index f56ce5b4..b1fc8fd9 100644
--- a/archinstall/scripts/guided.py
+++ b/archinstall/scripts/guided.py
@@ -193,10 +193,6 @@ def perform_installation(mountpoint: Path):
 		if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
 			installation.user_set_pw('root', root_pw)
 
-		# This step must be after profile installs to allow profiles_bck to install language pre-requisites.
-		# After which, this step will set the language both for console and x11 if x11 was installed for instance.
-		installation.set_keyboard_language(locale_config.kb_layout)
-
 		if profile_config := archinstall.arguments.get('profile_config', None):
 			profile_config.profile.post_install(installation)
 
diff --git a/archinstall/scripts/swiss.py b/archinstall/scripts/swiss.py
index 8a5488bc..8813fd91 100644
--- a/archinstall/scripts/swiss.py
+++ b/archinstall/scripts/swiss.py
@@ -245,10 +245,6 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode):
 			if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
 				installation.user_set_pw('root', root_pw)
 
-			# This step must be after profile installs to allow profiles_bck to install language pre-requisites.
-			# After which, this step will set the language both for console and x11 if x11 was installed for instance.
-			installation.set_keyboard_language(locale_config.kb_layout)
-
 			if profile_config := archinstall.arguments.get('profile_config', None):
 				profile_config.profile.post_install(installation)
 
diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py
index 69e509ba..3c9a5876 100644
--- a/examples/interactive_installation.py
+++ b/examples/interactive_installation.py
@@ -166,10 +166,6 @@ def perform_installation(mountpoint: Path):
 		if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
 			installation.user_set_pw('root', root_pw)
 
-		# This step must be after profile installs to allow profiles_bck to install language pre-requisites.
-		# After which, this step will set the language both for console and x11 if x11 was installed for instance.
-		installation.set_keyboard_language(locale_config.kb_layout)
-
 		if profile_config := archinstall.arguments.get('profile_config', None):
 			profile_config.profile.post_install(installation)
 
-- 
cgit v1.2.3-70-g09d2