diff --git a/pyrenee-conversion-utility.sh b/pyrenee-conversion-utility.sh index fe58f00..663fbff 100644 --- a/pyrenee-conversion-utility.sh +++ b/pyrenee-conversion-utility.sh @@ -67,9 +67,12 @@ dialog $BACK "$TITLE" --insecure --title "Password Provider" --passwordbox "Prov apk upgrade | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing upgrades" --progressbox $SIZE2 setup-xorg-base | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Xorg Base" --progressbox $SIZE2 -# apk add doas htop nano firefox flatpak plasma kde-applications-base kde-applications-accessibility pm-utils | dialog $BACK "$TITLE - Installing KDE Plasma" --progressbox $SIZE2 -# apk add doas htop nano firefox flatpak lumina-desktop pm-utils sddm-breeze breeze-grub breeze-gtk breeze-plymouth breeze-icons qterminal | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Lumina Desktop" --progressbox $SIZE2 - apk add doas htop nano firefox flatpak lumina-desktop pm-utils lightdm-qt5 breeze breeze-grub breeze-gtk breeze-plymouth breeze-icons qterminal | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Lumina Desktop" --progressbox $SIZE2 + apk add doas htop nano firefox flatpak elogind polkit-elogind pm-utils | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Base applications" --progressbox $SIZE2 +# apk add plasma kde-applications-base kde-applications-accessibility | dialog $BACK "$TITLE - Installing KDE Plasma" --progressbox $SIZE2 +# apk add lumina-desktop sddm-breeze breeze-grub breeze-gtk breeze-plymouth breeze-icons qterminal | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Lumina Desktop" --progressbox $SIZE2 +# apk add lumina-desktop lightdm-gtk-greeter breeze breeze-grub breeze-gtk breeze-plymouth breeze-icons qterminal | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Lumina Desktop" --progressbox $SIZE2 +# apk add mate-desktop-environment dbus dbus-x11 lxdm adwaita-icon-theme faenza-icon-theme | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing Mate Desktop" --progressbox $SIZE2 + apk add lxqt-desktop sddm-breeze | dialog $BACK "$TITLE - Installing LXQt Desktop" --progressbox $SIZE2 apk add $(apk search -q ttf- | grep -v '\-doc' | grep -v 'opensans') | dialog $BACK "\Z7Pyrenee Conversion Utility - Installing True Type Fonts" --progressbox $SIZE2 #backup original doas.conf and permit group wheel and add some persistence cp /etc/doas.d/doas.conf /etc/doas.d/doas.conf.bak @@ -79,38 +82,17 @@ dialog $BACK "$TITLE" --insecure --title "Password Provider" --passwordbox "Prov # apk add xf86-qxl | dialog $BACK "$TITLE - Installing QEMU video drivers" --progressbox $SIZE #backup nanorc & change nanorc settings to be a bit more advanced cp /etc/nanorc /etc/nanorc.bak - sed -i 's/# set atblanks/set atblanks/g' /etc/nanorc - sed -i 's/# set autoindent/set autoindent/g' /etc/nanorc - sed -i 's/# set indicator/set indicator/g' /etc/nanorc - sed -i 's/# set jumpyscrolling/set jumpyscrolling/g' /etc/nanorc - sed -i 's/# set linenumbers/set linenumbers/g' /etc/nanorc - sed -i 's/# set mouse/set mouse/g' /etc/nanorc - sed -i 's/# set smarthome/set smarthome/g' /etc/nanorc - sed -i 's/# set softwrap/set softwrap/g' /etc/nanorc - sed -i 's/# set tabsize 8/set tabsize 2/g' /etc/nanorc - sed -i 's/# set tabstospaces/set tabstospaces/g' /etc/nanorc - sed -i 's/# set wordbounds/set wordbounds/g' /etc/nanorc - sed -i 's/# set zap/set zap/g' /etc/nanorc -#set prompt colors in nano - sed -i 's/# set titlecolor/set titlecolor/g' /etc/nanorc - sed -i 's/# set promptcolor/set promptcolor/g' /etc/nanorc - sed -i 's/# set statuscolor/set statuscolor/g' /etc/nanorc - sed -i 's/# set errorcolor/set errorcolor/g' /etc/nanorc - sed -i 's/# set spotlightcolor/set spotlightcolor/g' /etc/nanorc - sed -i 's/# set selectedcolor/set selectedcolor/g' /etc/nanorc - sed -i 's/# set stripecolor/set stripecolor/g' /etc/nanorc - sed -i 's/# set scrollercolor/set scrollercolor/g' /etc/nanorc - sed -i 's/# set numbercolor/set numbercolor/g' /etc/nanorc - sed -i 's/# set keycolor/set keycolor/g' /etc/nanorc - sed -i 's/# set functioncolor/set functioncolor/g' /etc/nanorc - sed -i 's/# include \"\/usr\/share\/nano\/\*\.nanorc/include \"\/usr\/share\/nano\/\*\.nanorc/g' /etc/nanorc + wget https://gitlab.com/pyrenee-linux/pyrenee-linux/-/raw/main/nanorc + mv nanorc /etc/ + wget https://gitlab.com/pyrenee-linux/pyrenee-linux/-/raw/main/.nanorc + mv .nanorc /root/ #add & enable Internet Wireless Device (iwd) apk add iwd rc-service iwd start cp /etc/NetworkManager/NetworkManager.conf /etc/NetworkManager/NetworkManager.conf.bak echo -e "\n[device]\nwifi.backend=iwd" >> /etc/NetworkManager/NetworkManager.conf -<> /etc/modules -COMMENT + #enable Suspend on LID close mkdir /etc/acpi/LID touch /etc/acpi/LID/00000080 @@ -134,11 +116,14 @@ COMMENT addgroup $USER video addgroup $USER wheel #add sddm to OpenRC to automatically start it at boot -# rc-update add sddm - rc-update add lightdm + rc-update add sddm +# rc-update add udev +# rc-update add dbus +# rc-update add lxdm +# rc-update add lightdm #add Flathub to Flatpak and install Flatseal to graphically edit permissions doas -u $USER flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -# doas -u $USER flatpak install com.github.tchx84.Flatseal -y + doas -u $USER flatpak install com.github.tchx84.Flatseal -y dialog $BACK "$TITLE" --title "Finished!" --yes-label "Enter" --no-label "Esc" --yesno "Conversion was completed, it is recommended to reboot to finish your new Desktop experience!\n\nPlease press to reboot or to continue your current session." $SIZE if [ "$?" != "0" ] then