| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | profiles/applications/lxqt.py | 2 | ||||
| -rw-r--r-- | profiles/desktop.py | 5 | ||||
| -rw-r--r-- | profiles/i3.py | 3 | ||||
| -rw-r--r-- | profiles/sway.py | 3 | ||||
| -rw-r--r-- | profiles/xorg.py | 5 |
diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py index 5ce875cc..2099f3fa 100644 --- a/profiles/applications/lxqt.py +++ b/profiles/applications/lxqt.py @@ -1,3 +1,3 @@ import archinstall -installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad slock archlinux-wallpaper sddm") +installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad slock sddm") diff --git a/profiles/desktop.py b/profiles/desktop.py index dce2e18b..2aea6d30 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -16,8 +16,9 @@ def _prep_function(*args, **kwargs): for more input before any other installer steps start. """ - supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate', 'deepin'] - desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ') + supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate'] + desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', + allow_empty_input=False, sort=True) # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded diff --git a/profiles/i3.py b/profiles/i3.py index 67028b2d..b82c03d6 100644 --- a/profiles/i3.py +++ b/profiles/i3.py @@ -17,7 +17,8 @@ def _prep_function(*args, **kwargs): """ supported_configurations = ['i3-wm', 'i3-gaps'] - desktop = archinstall.generic_select(supported_configurations, 'Select your desired configuration: ') + desktop = archinstall.generic_select(supported_configurations, 'Select your desired configuration: ', + allow_empty_input=False, sort=True) # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded diff --git a/profiles/sway.py b/profiles/sway.py index 5633cce2..53eb8c5a 100644 --- a/profiles/sway.py +++ b/profiles/sway.py @@ -11,6 +11,9 @@ def _prep_function(*args, **kwargs): other code in this stage. So it's a safe way to ask the user for more input before any other installer steps start. """ + + __builtins__['_gfx_driver_packages'] = archinstall.select_driver() + return True # Ensures that this code only gets executed if executed diff --git a/profiles/xorg.py b/profiles/xorg.py index 42597a37..413a6308 100644 --- a/profiles/xorg.py +++ b/profiles/xorg.py @@ -1,7 +1,8 @@ # A system with "xorg" installed -import archinstall, os - +import os +from archinstall import generic_select, sys_command, RequirementError +import archinstall is_top_level_profile = True def _prep_function(*args, **kwargs): |