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

Fixing awesome and xorg for first test run.

This commit is contained in:
Anton Hvornum 2020-09-30 08:37:54 +00:00
parent 5ce8c20333
commit 5a4d68e617
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/profiles.py
View File

@ -82,8 +82,8 @@ class Profile():
return None return None
def py_exec_mock(self): # def py_exec_mock(self):
spec.loader.exec_module(imported) # spec.loader.exec_module(imported)
def load_instructions(self): def load_instructions(self):
if (absolute_path := self.path): if (absolute_path := self.path):

3
profiles/awesome.py
View File

@ -2,6 +2,9 @@
import archinstall import archinstall
# Install dependency profiles
archinstall.install_profile('xorg')
arguments = { arguments = {
'keyboard_layout' : 'sv-latin1', 'keyboard_layout' : 'sv-latin1',
"editor" : "nano", "editor" : "nano",

28
profiles/xorg.py
View File

@ -1,6 +1,6 @@
# A desktop environemtn using "Awesome" window manager. # A desktop environemtn using "Awesome" window manager.
import archinstall import archinstall, os
AVAILABLE_DRIVERS = { AVAILABLE_DRIVERS = {
# Sub-dicts are layer-2 options to be selected # Sub-dicts are layer-2 options to be selected
@ -48,6 +48,8 @@ def select_driver(options):
selected_driver = input('Select your graphics card driver: ') selected_driver = input('Select your graphics card driver: ')
initial_option = selected_driver initial_option = selected_driver
# Disabled search for now, only a few profiles exist anyway
#
#print(' -- You can enter ? or help to search for more drivers --') #print(' -- You can enter ? or help to search for more drivers --')
#if selected_driver.lower() in ('?', 'help'): #if selected_driver.lower() in ('?', 'help'):
# filter_string = input('Search for layout containing (example: "sv-"): ') # filter_string = input('Search for layout containing (example: "sv-"): ')
@ -89,18 +91,24 @@ def _prep_function(*args, **kwargs):
print('You need to select which graphics card you\'re using.') print('You need to select which graphics card you\'re using.')
print('This in order to setup the required graphics drivers.') print('This in order to setup the required graphics drivers.')
__builtins__.__dict__['_gfx_driver_packages'] = select_driver(AVAILABLE_DRIVERS) __builtins__['_gfx_driver_packages'] = select_driver(AVAILABLE_DRIVERS)
return True return True
# installation.add_additional_packages("xorg-server xorg-xinit") # Absolute import, not conventional import.
# Ensures that this code only gets executed if executed
# through importlib.util.spec_from_file_location("/somewhere/xorg.py")
if os.path.basename(__name__) == 'xorg.py':
print('This should not be printed!')
# with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'a') as X11: installation.add_additional_packages("xorg-server xorg-xinit")
# X11.write('setxkbmap se\n')
# with open(f'{installation.mountpoint}/etc/vconsole.conf', 'a') as vconsole: # with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'a') as X11:
# vconsole.write('KEYMAP={keyboard_layout}\n'.format(**arguments)) # X11.write('setxkbmap se\n')
# vconsole.write('FONT=lat9w-16\n')
# awesome = archinstall.Application(installation, 'awesome') # with open(f'{installation.mountpoint}/etc/vconsole.conf', 'a') as vconsole:
# awesome.install() # vconsole.write('KEYMAP={keyboard_layout}\n'.format(**arguments))
# vconsole.write('FONT=lat9w-16\n')
# awesome = archinstall.Application(installation, 'awesome')
# awesome.install()