| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | CONTRIBUTING.md | 11 | ||||
| -rw-r--r-- | examples/guided.py | 1 | ||||
| -rw-r--r-- | profiles/applications/kde.py | 21 | ||||
| -rw-r--r-- | profiles/kde.py | 16 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fdfd6644..88fd29f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,9 +37,10 @@ It is also helpful to add links to online documentation or to the implementation Also, do not squash your commits after you have submitted a pull request, as this erases context during review. We will squash commits when the pull request is merged. -At present the core developers are (alphabetically): +At present the current contributors are (alphabetically): - * Anton Hvornum (@Torxed) - * Jerker Bengtsson (@jaybent) - * Varun Madiath (@vamega) - * demostanis (@demostanis)
\ No newline at end of file + * Anton Hvornum ([@Torxed](https://github.com/Torxed)) + * demostanis ([@demostanis](https://github.com/demostanis)) + * Jerker Bengtsson ([@jaybent](https://github.com/jaybent)) + * Varun Madiath ([@vamega](https://github.com/vamega)) + * nullrequest ([@advaithm](https://github.com/advaithm)) diff --git a/examples/guided.py b/examples/guided.py index 4bc65349..7726d5b9 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -52,6 +52,7 @@ def perform_installation(device, boot_partition, language, mirrors): if archinstall.storage['_guided']['network']: installation.configure_nic(**archinstall.storage['_guided']['network']) installation.enable_service('systemd-networkd') + installation.enable_service('systemd-resolved') if archinstall.storage['_guided']['packages'] and archinstall.storage['_guided']['packages'][0] != '': installation.add_additional_packages(archinstall.storage['_guided']['packages']) 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') |