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

merge kde and kde-wayland

This commit is contained in:
advaithm 2021-04-06 08:34:34 +05:30 committed by Dylan Taylor
parent 44df0f6046
commit 926906d946
3 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

34
profiles/kde-wayland.py
View File

@ -1,34 +0,0 @@
# A desktop environment 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')

13
profiles/kde.py
View File

@ -1,6 +1,6 @@
# A desktop environment using "KDE".
import archinstall, os
import archinstall, os
# TODO: Remove hard dependency of bash (due to .bash_profile)
@ -20,6 +20,17 @@ 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 is currently in a buggy state on Nvidia cards")
choice = input("Kde plasma has a wayland support would you like to install the required binaries [Y/n] ").lower()
if choice == "y":
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)
# 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