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

Merge pull request #84 from advaithm/master 

reworked kde.py to use sddm instead of hacking xinitrc
This commit is contained in:
Anton Hvornum 2021-01-21 17:05:37 +01:00 committed by GitHub
parent f152b67536 fe1be8d278
commit 178bfe9bfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
profiles/applications/kde.py
View File

@ -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)
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

16
profiles/kde.py
View File

@ -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')
installation.enable_service('sddm')