Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-09-29 22:09:28 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-09-29 22:09:28 +0000
commitf8963421479858ff68568f1bf492cf867e1a25aa (patch)
treedf56d30a51dbbefe8742e2886b495dc6fc349e3a
parent6338e7116ef5405cd9b97f066e45a89b7d8e67e7 (diff)
Adding a baseline xorg profile that can be called from other profiles. Such as the awesome profile, and in the future gnome and kde.
-rw-r--r--archinstall/lib/user_interaction.py27
-rw-r--r--examples/guided.py3
-rw-r--r--profiles/xorg.py100
3 files changed, 129 insertions, 1 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 9f939f12..905962c9 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -17,6 +17,33 @@ def select_disk(dict_o_disks):
raise DiskError('select_disk() requires a non-empty dictionary of disks to select from.')
+def select_profile(options):
+ profiles = sorted(list(options))
+
+ if len(profiles) >= 1:
+ for index, profile in enumerate(profiles):
+ print(f"{index}: {profile}")
+
+ print(' -- The above list is pre-programmed profiles. --')
+ print(' -- They might make it easier to install things like desktop environments. --')
+ print(' -- (Leave blank to skip this next optional step) --')
+ selected_profile = input('Any particular pre-programmed profile you want to install: ')
+
+ #print(' -- You can enter ? or help to search for more profiles --')
+ #if selected_profile.lower() in ('?', 'help'):
+ # filter_string = input('Search for layout containing (example: "sv-"): ')
+ # new_options = search_keyboard_layout(filter_string)
+ # return select_language(new_options)
+ if selected_profile.isdigit() and (pos := int(selected_profile)) <= len(profiles)-1:
+ selected_profile = profiles[pos]
+ elif selected_profile in options:
+ selected_profile = options[options.index(selected_profile)]
+ else:
+ RequirementError("Selected profile does not exist.")
+ return selected_profile
+
+ raise RequirementError("Selecting profiles require a least one profile to be given as an option.")
+
def select_language(options, show_only_country_codes=True):
if show_only_country_codes:
languages = sorted([language for language in list(options) if len(language) == 2])
diff --git a/examples/guided.py b/examples/guided.py
index 7ecd070d..7b09b159 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -92,7 +92,8 @@ while 1:
users[new_user] = new_user_passwd
break
-profile = input('Any particular profile you want to install: ')
+profile = archinstall.select_profile(archinstall.list_profiles())
+
packages = input('Additional packages aside from base (space separated): ').split(' ')
diff --git a/profiles/xorg.py b/profiles/xorg.py
new file mode 100644
index 00000000..58128489
--- /dev/null
+++ b/profiles/xorg.py
@@ -0,0 +1,100 @@
+# A desktop environemtn using "Awesome" window manager.
+
+import archinstall
+
+AVAILABLE_DRIVERS = {
+ # Sub-dicts are layer-2 options to be selected
+ # and sets are a list of packages to be installed
+ 'AMD / ATI' : {
+ 'amd' : {'xf86-video-amdgpu'},
+ 'ati' : {'xf86-video-ati'}
+ },
+ 'intel' : {'xf86-video-intel'}
+ 'nvidia' : {
+ 'open source' : {'xf86-video-nouveau'},
+ 'proprietary' : {'nvidia'}
+ },
+ 'mesa' : {'mesa'},
+ 'fbdev' : {'xf86-video-fbdev'},
+ 'vesa' : {'xf86-video-vesa'},
+ 'vmware' : {'xf86-video-vmware'}
+}
+
+def select_driver(options):
+ """
+ Some what convoluted function, which's job is simple.
+ Select a graphics driver from a pre-defined set of popular options.
+
+ (The template xorg is for beginner users, not advanced, and should
+ there for appeal to the general public first and edge cases later)
+
+ # TODO: Add "lspci | grep -e VGA -e 3D" auto-detect-helpers?
+ """
+ drivers = sorted(list(options))
+
+ if len(drivers) >= 1:
+ for index, driver in enumerate(drivers):
+ print(f"{index}: {driver}")
+
+ print(' -- The above list are supported graphic card drivers. --')
+ print(' -- You need to select (and read about) which one you need. --')
+
+ selected_driver = input('Select your graphics card driver: ')
+
+ #print(' -- You can enter ? or help to search for more drivers --')
+ #if selected_driver.lower() in ('?', 'help'):
+ # filter_string = input('Search for layout containing (example: "sv-"): ')
+ # new_options = search_keyboard_layout(filter_string)
+ # return select_language(new_options)
+ if selected_driver.isdigit() and (pos := int(selected_driver)) <= len(drivers)-1:
+ selected_driver = drivers[pos]
+ elif selected_driver in options:
+ selected_driver = options[options.index(selected_driver)]
+ else:
+ RequirementError("Selected driver does not exist.")
+
+ if type(selected_driver) == dict:
+ for index, driver_package_group in enumerate(selected_driver):
+ print(f"{index}: {driver_package_group}")
+
+ selected_driver_package_group = input(f'Which driver-type do you want for {selected_driver}: ')
+ if selected_driver_package_group.isdigit() and (pos := int(selected_driver_package_group)) <= len(drivers)-1:
+ selected_driver_package_group = drivers[pos]
+ elif selected_driver_package_group in options:
+ selected_driver_package_group = options[options.index(selected_driver_package_group)]
+ else:
+ RequirementError(f"Selected driver-type does not exist for {selected_driver}.")
+
+ return selected_driver_package_group
+
+ return selected_driver
+
+ raise RequirementError("Selecting drivers require a least one profile to be given as an option.")
+
+def _prep_function(*args, **kwargs):
+ """
+ Magic function called by the importing installer
+ before continuing any further. It also avoids executing any
+ other code in this stage. So it's a safe way to ask the user
+ for more input before any other installer steps start.
+ """
+ print('You need to select which graphics card you\'re using.')
+ print('This in order to setup the required graphics drivers.')
+
+ __builtins__.__dict__['_gfx_driver'] = select_driver(AVAILABLE_DRIVERS)
+
+ return True
+
+_prep_function()
+
+# installation.add_additional_packages("xorg-server xorg-xinit")
+
+# with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'a') as X11:
+# X11.write('setxkbmap se\n')
+
+# with open(f'{installation.mountpoint}/etc/vconsole.conf', 'a') as vconsole:
+# vconsole.write('KEYMAP={keyboard_layout}\n'.format(**arguments))
+# vconsole.write('FONT=lat9w-16\n')
+
+# awesome = archinstall.Application(installation, 'awesome')
+# awesome.install() \ No newline at end of file