RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed i3-gaps configuration choice (#1635) 

Fix to issue #1621
This commit is contained in:
ettoc00 2023-02-28 00:08:49 +01:00 committed by GitHub
parent 2a17ba9833
commit f212a01a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
profiles/i3.py
View File

@ -1,14 +1,13 @@
# Common package for i3, lets user select which i3 configuration they want. # Common package for i3.
import archinstall import archinstall
from archinstall import Menu
from archinstall.lib.menu.menu import MenuSelectionType
is_top_level_profile = False is_top_level_profile = False
# New way of defining packages for a profile, which is iterable and can be used out side # 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". # of the profile to get a list of "what packages will be installed".
__packages__ = [ __packages__ = [
'i3-wm'
'i3lock', 'i3lock',
'i3status', 'i3status',
'i3blocks', 'i3blocks',
@ -27,28 +26,13 @@ def _prep_function(*args, **kwargs):
for more input before any other installer steps start. for more input before any other installer steps start.
""" """
supported_configurations = ['i3-wm', 'i3-gaps'] # i3 requires a functioning Xorg installation.
profile = archinstall.Profile(None, 'xorg')
choice = Menu('Select your desired configuration', supported_configurations).run() with profile.load_instructions(namespace='xorg.py') as imported:
if hasattr(imported, '_prep_function'):
if choice.type_ != MenuSelectionType.Selection: return imported._prep_function()
return False else:
print('Deprecated (??): xorg profile has no _prep_function() anymore')
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
if __name__ == 'i3': if __name__ == 'i3':
@ -65,17 +49,11 @@ if __name__ == 'i3':
this is therefore just a helper to get started 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 # Install dependency profiles
archinstall.storage['installation_session'].install_profile('xorg') archinstall.storage['installation_session'].install_profile('xorg')
# gaps is installed by default so we are overriding it here with lightdm # Install the i3 packages
archinstall.storage['installation_session'].add_additional_packages(__packages__[4:]) 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') archinstall.storage['installation_session'].enable_service('lightdm')
# install the i3 group now
archinstall.storage['installation_session'].add_additional_packages(archinstall.storage['_i3_configuration'])