Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorettoc00 <41289053+ettoc00@users.noreply.github.com>2023-02-28 00:08:49 +0100
committerGitHub <noreply@github.com>2023-02-28 00:08:49 +0100
commitf212a01a56e51712134cf277031b1f45483bcefa (patch)
tree9be78cce5487926249d559e49eb8389a09df32c7
parent2a17ba983330cf8c511b9b1fa0329acaa2631c7c (diff)
Removed i3-gaps configuration choice (#1635)
Fix to issue #1621
-rw-r--r--profiles/i3.py46
1 files changed, 12 insertions, 34 deletions
diff --git a/profiles/i3.py b/profiles/i3.py
index 37029a02..d3e6e6b0 100644
--- a/profiles/i3.py
+++ b/profiles/i3.py
@@ -1,14 +1,13 @@
-# Common package for i3, lets user select which i3 configuration they want.
+# Common package for i3.
import archinstall
-from archinstall import Menu
-from archinstall.lib.menu.menu import MenuSelectionType
is_top_level_profile = False
# New way of defining packages for a profile, which is iterable and can be used out side
# of the profile to get a list of "what packages will be installed".
__packages__ = [
+ 'i3-wm'
'i3lock',
'i3status',
'i3blocks',
@@ -27,28 +26,13 @@ def _prep_function(*args, **kwargs):
for more input before any other installer steps start.
"""
- supported_configurations = ['i3-wm', 'i3-gaps']
-
- choice = Menu('Select your desired configuration', supported_configurations).run()
-
- if choice.type_ != MenuSelectionType.Selection:
- return False
-
- if choice.value:
- # Temporarily store the selected desktop profile
- # in a session-safe location, since this module will get reloaded
- # the next time it gets executed.
- archinstall.storage['_i3_configuration'] = choice.value
-
- # i3 requires a functioning Xorg installation.
- profile = archinstall.Profile(None, 'xorg')
- with profile.load_instructions(namespace='xorg.py') as imported:
- if hasattr(imported, '_prep_function'):
- return imported._prep_function()
- else:
- print('Deprecated (??): xorg profile has no _prep_function() anymore')
-
- return False
+ # i3 requires a functioning Xorg installation.
+ profile = archinstall.Profile(None, 'xorg')
+ with profile.load_instructions(namespace='xorg.py') as imported:
+ if hasattr(imported, '_prep_function'):
+ return imported._prep_function()
+ else:
+ print('Deprecated (??): xorg profile has no _prep_function() anymore')
if __name__ == 'i3':
@@ -65,17 +49,11 @@ if __name__ == 'i3':
this is therefore just a helper to get started
"""
- # Install common packages for all i3 configurations
- archinstall.storage['installation_session'].add_additional_packages(__packages__[:4])
-
# Install dependency profiles
archinstall.storage['installation_session'].install_profile('xorg')
- # gaps is installed by default so we are overriding it here with lightdm
- archinstall.storage['installation_session'].add_additional_packages(__packages__[4:])
+ # Install the i3 packages
+ archinstall.storage['installation_session'].add_additional_packages(__packages__)
- # Auto start lightdm for all users
+ # Enable autostart of lightdm for all users
archinstall.storage['installation_session'].enable_service('lightdm')
-
- # install the i3 group now
- archinstall.storage['installation_session'].add_additional_packages(archinstall.storage['_i3_configuration'])