Merge branch 'main' of https://github.com/ChrisTitusTech/ArchTitus

Conflicts: 0-preinstall.sh 1-setup.sh 3-post-setup.sh
2021-10-26 08:07:03 -04:00 · 2021-10-26 08:07:03 -04:00 · e35d616ec3
parent c4523cd987 e651ef3cf8
commit e35d616ec3
4 changed files with 19 additions and 23 deletions
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@ -1,15 +1,12 @@
 #!/usr/bin/env bash
-#------------------------------------------------------------------------------------
-#                                                                          ▄▄
-#▀███▀▀▀██▄         ██    ██                        ██                    ███
-#  ██    ██         ██    ██                       ▄██▄                    ██
-#  ██    ██ ▄▄█▀██████████████  ▄▄█▀██▀███▄███    ▄█▀██▄   ▀███▄███ ▄██▀██ ███████▄
-#  ██▀▀▀█▄▄▄█▀   ██ ██    ██   ▄█▀   ██ ██▀ ▀▀   ▄█  ▀██     ██▀ ▀▀██▀  ██ ██    ██
-#  ██    ▀███▀▀▀▀▀▀ ██    ██   ██▀▀▀▀▀▀ ██       ████████    ██    ██      ██    ██
-#  ██    ▄███▄    ▄ ██    ██   ██▄    ▄ ██      █▀      ██   ██    ██▄    ▄██    ██
-#▄████████  ▀█████▀ ▀████ ▀████ ▀█████▀████▄  ▄███▄   ▄████▄████▄   █████▀████  ████▄
-#
-#------------------------------------------------------------------------------------
+#-------------------------------------------------------------------------
+#   █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
+#  ██╔══██╗██╔══██╗██╔════╝██║  ██║╚══██╔══╝██║╚══██╔══╝██║   ██║██╔════╝
+#  ███████║██████╔╝██║     ███████║   ██║   ██║   ██║   ██║   ██║███████╗
+#  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║
+#  ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
+#  ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
+#-------------------------------------------------------------------------
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 echo "-------------------------------------------------"
 echo "Setting up mirrors for optimal download          "
@ -20,16 +17,15 @@ pacman -S --noconfirm pacman-contrib terminus-font
 setfont ter-v22b
 sed -i 's/^#Para/Para/' /etc/pacman.conf
 pacman -S --noconfirm reflector rsync
-cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
-echo -e "  - -----------------------------------------------------------------------------------"
-echo -e " ▀███▀▀▀██▄         ██    ██                        ██                    ███          "
-echo -e "   ██    ██         ██    ██                       ▄██▄                    ██          "
-echo -e "   ██    ██ ▄▄█▀██████████████  ▄▄█▀██▀███▄███    ▄█▀██▄   ▀███▄███ ▄██▀██ ███████▄    "
-echo -e "   ██▀▀▀█▄▄▄█▀   ██ ██    ██   ▄█▀   ██ ██▀ ▀▀   ▄█  ▀██     ██▀ ▀▀██▀  ██ ██    ██    "
-echo -e "   ██    ▀███▀▀▀▀▀▀ ██    ██   ██▀▀▀▀▀▀ ██       ████████    ██    ██      ██    ██    "
-echo -e "   ██    ▄███▄    ▄ ██    ██   ██▄    ▄ ██      █▀      ██   ██    ██▄    ▄██    ██    "
-echo -e " ▄████████  ▀█████▀ ▀████ ▀████ ▀█████▀████▄  ▄███▄   ▄████▄████▄   █████▀████  ████▄  "
-echo -e "  - -----------------------------------------------------------------------------------"
+mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
+echo -e "-------------------------------------------------------------------------"
+echo -e "   █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗"
+echo -e "  ██╔══██╗██╔══██╗██╔════╝██║  ██║╚══██╔══╝██║╚══██╔══╝██║   ██║██╔════╝"
+echo -e "  ███████║██████╔╝██║     ███████║   ██║   ██║   ██║   ██║   ██║███████╗"
+echo -e "  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║"
+echo -e "  ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║"
+echo -e "  ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝"
+echo -e "-------------------------------------------------------------------------"
 reflector -a 48 -c $iso -f 5 -l 20 --sort rate --save /etc/pacman.d/mirrorlist
 mkdir /mnt

--- a/1-setup.sh
+++ b/1-setup.sh
@ -67,7 +67,6 @@ PKGS=(
 'plasma-desktop' # KDE Load second
 'alsa-plugins' # audio plugins
 'alsa-utils' # audio utils
-'apparmor' # Security module
 'ark' # compression
 'audiocd-kio' 
 'autoconf' # build
@ -177,7 +176,6 @@ PKGS=(
 'vim'
 'virt-manager'
 'virt-viewer'
-'vlc'
 'wget'
 'which'
 'wine-gecko'
--- a/2-user.sh
+++ b/2-user.sh
@ -42,6 +42,7 @@ PKGS=(
 'nordic-theme'
 'noto-fonts-emoji'
 'papirus-icon-theme'
+'plasma-pa'
 'ocs-url' # install packages from websites
 'sddm-nordic-theme-git'
 'snapper-gui-git'
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@ -26,6 +26,7 @@ EOF

 # ------------------------------------------------------------------------

+echo -e "\nEnabling essential services"
 echo -e "\nEnabling other important services!"

 sudo systemctl enable ufw