diff --git a/README.md b/README.md index 0ddcd49..da46e6a 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Some major/noteworthy differences from common configurations: - EXT4 fast_commit mode is enabled by default - makepkg is configured for better than stock performance - a custom .bashrc with useful power management aliases is included -- ...all of this and more on KDE Plasma Wayland +- ...all of this and more on KDE Plasma (Wayland)/Sway # Usage Upon loading up the official Artix base ISO (tested on weekly base images only), logging in, connecting to the internet, and switching to the root user, run: diff --git a/chrootInstall.sh b/chrootInstall.sh index 1beb2fc..5e3b976 100755 --- a/chrootInstall.sh +++ b/chrootInstall.sh @@ -5,6 +5,7 @@ formfactor="$(< /tempfiles/formfactor)" cpu="$(< /tempfiles/cpu)" threadsminusone="$(< /tempfiles/threadsminusone)" gpu="$(< /tempfiles/gpu)" +desktop="$(< /tempfiles/desktop)" intel_vaapi_driver="$(< /tempfiles/intel_vaapi_driver)" boot="$(< /tempfiles/boot)" disk="$(< /tempfiles/disk)" @@ -118,18 +119,30 @@ chown "$username":users /home/"$username"/.local/share chmod 755 /home/"$username"/{.config,.local/share} # installing desktop environment and addons + utilities -if [ "$formfactor" == 1 ] || [ "$formfactor" == 2 ] || [ "$formfactor" == 3 ]; then - pacman -S pipewire pipewire-pulse pipewire-jack pipewire-alsa wireplumber polkit plasma-desktop plasma-wayland-session kscreen kdeplasma-addons spectacle gwenview plasma-nm plasma-pa breeze-gtk kde-gtk-config kio-extras khotkeys kwalletmanager pcmanfm-qt yakuake ark kate micro bluedevil bluez-openrc --needed --noconfirm - echo -e "if [ -z \$DISPLAY ] && [ "\$\(tty\)" = "/dev/tty1" ]; then exec dbus-run-session startplasma-wayland; fi" >> /home/"$username"/.bash_profile - curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/powerset/powerset.sh -o /usr/local/bin/powerset.sh - mkdir -p /home/"$username"/.config/autostart/ - curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/pipewire-start/pipewire-start.sh -o /usr/local/bin/pipewire-start.sh - curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/pipewire-start/pipewire.desktop -o /home/"$username"/.config/autostart/pipewire.desktop - echo -e \#\!/usr/bin/env bash"\nfstrim -Av &" > /etc/local.d/trim.start - chmod 755 /usr/local/bin/powerset.sh /usr/local/bin/pipewire-start.sh /etc/local.d/trim.start - chown -R root /usr/local/bin /etc/local.d +if [ "$desktop" != 0 ]; then + pacman -S pipewire pipewire-pulse pipewire-jack pipewire-alsa wireplumber polkit pcmanfm-qt micro bluez-openrc fi +## KDE Plasma +if [ "$desktop" == 1 ]; then + pacman -S plasma-desktop plasma-wayland-session kscreen kdeplasma-addons spectacle gwenview plasma-nm plasma-pa breeze-gtk kde-gtk-config kio-extras khotkeys kwalletmanager yakuake ark kate bluedevil pcmanfm-qt --needed --noconfirm + echo -e "if [ -z \$DISPLAY ] && [ "\$\(tty\)" = "/dev/tty1" ]; then exec dbus-run-session startplasma-wayland; fi" >> /home/"$username"/.bash_profile +fi + +## Sway +if [ "$desktop" == 2 ]; then + pacman -S sway waybar fuzzel foot ranger p7zip --needed --noconfirm + echo -e "if [ -z \$DISPLAY ] && [ "\$\(tty\)" = "/dev/tty1" ]; then exec sway; fi" >> /home/"$username"/.bash_profile +fi + +mkdir -p /home/"$username"/.config/autostart/ +curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/pipewire-start/pipewire.desktop -o /home/"$username"/.config/autostart/pipewire.desktop +curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/powerset/powerset.sh -o /usr/local/bin/powerset.sh +curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/pipewire-start/pipewire-start.sh -o /usr/local/bin/pipewire-start.sh +echo -e \#\!/usr/bin/env bash"\nfstrim -Av &" > /etc/local.d/trim.start +chmod 755 /usr/local/bin/powerset.sh /usr/local/bin/pipewire-start.sh /etc/local.d/trim.start +chown -R root /usr/local/bin /etc/local.d + # asus g14 2020 configuration if [ "$formfactor" == 1 ]; then echo 'options snd_hda_intel power_save=1' > /etc/modprobe.d/audio_powersave.conf diff --git a/install.sh b/install.sh index 9011911..15135ec 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ loadkeys us echo ---------------------------------------------------------------------------------------------- echo rwinkhart\'s artix install script -echo last updated december 03, 2022 +echo last updated december 04, 2022 echo ---------------------------------------------------------------------------------------------- echo You will be asked some questions before installation. echo -e "----------------------------------------------------------------------------------------------\n" @@ -41,6 +41,12 @@ ram=$(echo "$(< /proc/meminfo)" | grep 'MemTotal:' | awk '{print $2;}'); ram=$(e # stop hardware detection # start conditional questions +if [ "$formfactor" == 1 ] || [ "$formfactor" == 2 ] || [ "$formfactor" == 3 ]; then + echo -e '1. KDE Plasma\n2. Sway\n' + read -n 1 -rp "desktop: " desktop +else + desktop=0 +fi if [ "$gpu" == 'Intel' ]; then echo -e '1. libva-intel-driver (intel igpus up to coffee lake)\n2. intel-media-driver (intel igpus/dgpus newer than coffee lake)\n' read -n 1 -rp "va-api driver: " intel_vaapi_driver @@ -170,6 +176,7 @@ echo "$formfactor" > /mnt/tempfiles/formfactor echo "$cpu" > /mnt/tempfiles/cpu echo "$threadsminusone" > /mnt/tempfiles/threadsminusone echo "$gpu" > /mnt/tempfiles/gpu +echo "$desktop" > /mnt/tempfiles/desktop echo "$intel_vaapi_driver" > /mnt/tempfiles/intel_vaapi_driver echo "$boot" > /mnt/tempfiles/boot echo "$disk0" > /mnt/tempfiles/disk