From fe1be8d278c63ef99aca66362cf3d7ebcc70ee96 Mon Sep 17 00:00:00 2001 From: advaithm Date: Thu, 21 Jan 2021 18:57:41 +0530 Subject: reworked kde.py to use sddm instead of hacking xinitrc --- profiles/applications/kde.py | 21 +-------------------- profiles/kde.py | 16 +--------------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py index 8193a7ae..87a266b0 100644 --- a/profiles/applications/kde.py +++ b/profiles/applications/kde.py @@ -1,21 +1,2 @@ import archinstall - -installation.add_additional_packages("plasma-meta kde-applications-meta") # We'll support plasma-desktop (minimal) later - -with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'r') as xinitrc: - xinitrc_data = xinitrc.read() - -# Remove Xorg defaults -for line in xinitrc_data.split('\n'): - if 'twm &' in line: xinitrc_data = xinitrc_data.replace(line, f"# {line}") - if 'xclock' in line: xinitrc_data = xinitrc_data.replace(line, f"# {line}") - if 'xterm' in line: xinitrc_data = xinitrc_data.replace(line, f"# {line}") - -# Add the KDE specifics -xinitrc_data += '\n' -xinitrc_data += 'export DESKTOP_SESSION=plasma\n' -xinitrc_data += 'exec startplasma-x11\n' - -# And save it -with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'w') as xinitrc: - xinitrc.write(xinitrc_data) \ No newline at end of file +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 diff --git a/profiles/kde.py b/profiles/kde.py index 052998bd..752a08d2 100644 --- a/profiles/kde.py +++ b/profiles/kde.py @@ -32,18 +32,4 @@ if __name__ == 'kde': kde.install() # Enable autostart of KDE for all users - # (there's no handy service like Gnome, so we'll hack it) - for root, folders, files in os.walk(f'{installation.mountpoint}/home'): - for home in folders: - with open(os.path.join(root, f"{home}/.bash_profile"), 'a') as bash_profile: - bash_profile.write('\n') - bash_profile.write('if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then\n') - bash_profile.write(' exec startx\n') # Possibly do 'startx' only to remain logged in if KDE crashes. - bash_profile.write('fi\n') - break - - with open(f'{installation.mountpoint}/etc/skel/.bash_profile', 'a') as bash_profile: - bash_profile.write('\n') - bash_profile.write('if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then\n') - bash_profile.write(' exec startx\n') # Possibly do 'startx' only to remain logged in if KDE crashes. - bash_profile.write('fi\n') \ No newline at end of file + installation.enable_service('sddm') -- cgit v1.2.3-54-g00ecf