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

Merge pull request #192 from advaithm/kde-hook 

Use _post_install for wayland
This commit is contained in:
Anton Hvornum 2021-04-06 16:27:46 +00:00 committed by GitHub
parent 610d630863 b968bec771
commit a62debde33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
profiles/applications/kde-wayland.py
View File

@ -1,7 +0,0 @@
import archinstall
packages = "plasma-meta kde-applications-meta plasma-wayland-session sddm"
# if the package selection can be reduced go for it
if "nvidia" in _gfx_driver_packages:
packages = packages + " egl-wayland"
installation.add_additional_packages(packages)
# We'll support plasma-desktop-wayland (minimal) later

5
profiles/applications/kde.py
View File

@ -1,2 +1,5 @@
import archinstall
installation.add_additional_packages("plasma-meta kde-applications-meta sddm") # We'll support plasma-desktop (minimal) later iirc sddm should be part of plasma-meta
packages = "plasma-meta kde-applications-meta sddm plasma-wayland-session"
if "nvidia" in _gfx_driver_packages:
packages = packages + " egl-wayland"
installation.add_additional_packages(packages)

34
profiles/kde-wayland.py
View File

@ -1,34 +0,0 @@
# A desktop environement using "KDE".
import archinstall, os
# TODO: Remove hard dependency of bash (due to .bash_profile)
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')
# Ensures that this code only gets executed if executed
# through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
# or through conventional import kde
if __name__ == 'kde-wayland':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application kde from the template under /applications/
kde = archinstall.Application(installation, 'kde-wayland')
kde.install()
print("when you login, select Plasma (Wayland) for the wayland session")
# Enable autostart of KDE for all users
installation.enable_service('sddm')

8
profiles/kde.py
View File

@ -20,6 +20,14 @@ def _prep_function(*args, **kwargs):
else:
print('Deprecated (??): xorg profile has no _prep_function() anymore')
def _post_install(*args, **kwargs):
if "nvidia" in _gfx_driver_packages:
print("Plasma Wayland has known compatibility issues with the proprietary Nvidia driver")
choice = input("Would you like plasma-wayland to be the default session [Y/n] ").lower()
if choice == "y":
installation.arch_chroot("mv /usr/share/xsessions/plasma.desktop /usr/share/xsessions/plasmax11.desktop")
installation.arch_chroot("mv /usr/share/wayland-sessions/plasmawayland.desktop /usr/share/wayland-sessions/plasma.desktop")
return True
# Ensures that this code only gets executed if executed
# through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
# or through conventional import kde