Merge pull request #179 from advaithm/master

i3 and 13-gaps support
This commit is contained in:
Anton Hvornum 2021-04-05 16:21:43 +00:00 committed by GitHub
commit dc522b74b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 2 deletions

View File

@ -1,4 +1,4 @@
import getpass, time, json, sys, signal, os
import getpass, time, json, sys, signal, os, subprocess
import archinstall
from archinstall.lib.hardware import hasUEFI
@ -347,7 +347,11 @@ def perform_installation(device, boot_partition, language, mirrors):
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)
if archinstall.arguments.get('profile', None) == "i3-wm" or archinstall.arguments.get('profile', None) == "i3-gaps":
print("the installation of i3/i3-gaps does not conatain any configuerations for the wm. in this shell you should add your configuerations")
subprocess.check_call("arch-chroot /mnt")
ask_user_questions()
perform_installation_steps()

View File

@ -0,0 +1,2 @@
import archinstall
installation.add_additional_packages("i3lock i3status i3blocks i3-gaps")

View File

@ -0,0 +1,2 @@
import archinstall
installation.add_additional_packages("i3lock i3status i3blocks i3-wm")

28
profiles/i3-gaps.py Normal file
View File

@ -0,0 +1,28 @@
import archinstall
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.
"""
# KDE 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-wm':
# Install dependency profiles
installation.install_profile('xorg')
# gaps is installed by deafult so we are overriding it here
installation.add_additional_packages("lightdm-gtk-greeter lightdm")
# install the i3 group now
i3 = archinstall.Application(installation, 'i3-gaps')
i3.install()
# Auto start lightdm for all users
installation.enable_service('lightdm')

28
profiles/i3-wm.py Normal file
View File

@ -0,0 +1,28 @@
import archinstall
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.
"""
# KDE 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-wm':
# Install dependency profiles
installation.install_profile('xorg')
# we are installing lightdm to auto start i3
installation.add_additional_packages("lightdm-gtk-greeter lightdm")
# install the i3 group now
i3 = archinstall.Application(installation, 'i3-wm')
i3.install()
# Auto start lightdm for all users
installation.enable_service('lightdm')