Added startship to bash and fish. Changed portmaster install.

.bashrc

@@ -412,6 +412,7 @@ PROMPT_COMMAND=bash_prompt_command
 ##	which gets updated by $PROMT_COMMAND on behalf of the terminal
 bash_prompt
 unset bash_prompt
+eval "$(starship init bash)" >> ~/.bashrc
 
 
 

.gitignore

@@ -1,2 +1,3 @@
 install.conf
 installlog.txt
+/.idea

0-preinstall.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
-#-------------------------------------------------------------------------
+#------------------------------------------------------------------------------------
-#   █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
+#                                                                          ▄▄
-#  ██╔══██╗██╔══██╗██╔════╝██║  ██║╚══██╔══╝██║╚══██╔══╝██║   ██║██╔════╝
+#▀███▀▀▀██▄         ██    ██                        ██                    ███
-#  ███████║██████╔╝██║     ███████║   ██║   ██║   ██║   ██║   ██║███████╗
+#  ██    ██         ██    ██                       ▄██▄                    ██
-#  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║
+#  ██    ██ ▄▄█▀██████████████  ▄▄█▀██▀███▄███    ▄█▀██▄   ▀███▄███ ▄██▀██ ███████▄
-#  ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
+#  ██▀▀▀█▄▄▄█▀   ██ ██    ██   ▄█▀   ██ ██▀ ▀▀   ▄█  ▀██     ██▀ ▀▀██▀  ██ ██    ██
-#  ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
+#  ██    ▀███▀▀▀▀▀▀ ██    ██   ██▀▀▀▀▀▀ ██       ████████    ██    ██      ██    ██
-#-------------------------------------------------------------------------
+#  ██    ▄███▄    ▄ ██    ██   ██▄    ▄ ██      █▀      ██   ██    ██▄    ▄██    ██
+#▄████████  ▀█████▀ ▀████ ▀████ ▀█████▀████▄  ▄███▄   ▄████▄████▄   █████▀████  ████▄
+#
+#------------------------------------------------------------------------------------
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 echo "-------------------------------------------------"
 echo "Setting up mirrors for optimal download          "
@@ -18,14 +21,15 @@ setfont ter-v22b
 sed -i 's/^#Para/Para/' /etc/pacman.conf
 pacman -S --noconfirm reflector rsync
 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 "   ██    ██ ▄▄█▀██████████████  ▄▄█▀██▀███▄███    ▄█▀██▄   ▀███▄███ ▄██▀██ ███████▄    "
-echo -e "  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║"
+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
 

1-setup.sh

@@ -67,6 +67,7 @@ PKGS=(
 'plasma-desktop' # KDE Load second
 'alsa-plugins' # audio plugins
 'alsa-utils' # audio utils
+'apparmor' # Security module
 'ark' # compression
 'audiocd-kio' 
 'autoconf' # build
@@ -176,6 +177,7 @@ PKGS=(
 'vim'
 'virt-manager'
 'virt-viewer'
+'vlc'
 'wget'
 'which'
 'wine-gecko'

2-user.sh

@@ -59,11 +59,9 @@ for PKG in "${PKGS[@]}"; do
 done
 
 
-#echo eval "$(starship init bash)" >> ~/.bashrc
+# Fish
-
+mkdir $HOME/.config/fish
-  # Fish
+cp /root/BetterArch/dotfiles/fish/config.fish $HOME/.config/fish/
-  mkdir $HOME/.config/fish
-  mv /root/BetterArch/configs/.config/fish/config.fish $HOME/.config/fish/
 
 
 export PATH=$PATH:~/.local/bin
@@ -74,21 +72,21 @@ sleep 1
 konsave -a kde
 
 echo -e "\nInstalling Portsmaster\n"
-sudo pacman -S libnetfilter_queue libappindicator-gtk3
+#sudo pacman -S libnetfilter_queue libappindicator-gtk3
-cd ~
+#cd ~
-git clone https://github.com/safing/portmaster-packaging
+#git clone https://github.com/safing/portmaster-packaging
-cd portmaster-packaging/linux
+#cd portmaster-packaging/linux
-makepkg -is
+#makepkg -is
 
-#mkdir -p /var/lib/portmaster
+mkdir -p /var/lib/portmaster
-#wget -O /tmp/portmaster-start https://updates.safing.io/latest/linux_amd64/start/portmaster-start
+wget -O /tmp/portmaster-start https://updates.safing.io/latest/linux_amd64/start/portmaster-start
-#sudo mv /tmp/portmaster-start /var/lib/portmaster/portmaster-start
+sudo mv /tmp/portmaster-start /var/lib/portmaster/portmaster-start
-#sudo chmod a+x /var/lib/portmaster/portmaster-start
+sudo chmod a+x /var/lib/portmaster/portmaster-start
-#sudo /var/lib/portmaster/portmaster-start --data /var/lib/portmaster update
+sudo /var/lib/portmaster/portmaster-start --data /var/lib/portmaster update
-#sudo /var/lib/portmaster/portmaster-start core
+sudo /var/lib/portmaster/portmaster-start core
-#git clone https://github.com/safing/portmaster-packaging/ /tmp/portmaster-packaging
+git clone https://github.com/safing/portmaster-packaging/ /tmp/portmaster-packaging
-#sudo cp /tmp/portmaster-packaging/blob/master/linux/debian/portmaster.service /etc/systemd/system/
+sudo cp /tmp/portmaster-packaging/blob/master/linux/debian/portmaster.service /etc/systemd/system/
-#sudo systemctl enable --now portmaster
+sudo systemctl enable --now portmaster
 
 
 echo -e "\nDone!\n"

3-post-setup.sh

@@ -26,15 +26,6 @@ EOF
 
 # ------------------------------------------------------------------------
 
-echo -e "\nEnabling essential services"
-echo -e "\nEnabling other important services!"
-
-sudo systemctl enable ufw
-sudo systemctl enable fail2ban
-sudo systemctl enable --now portmaster
-
-# ------------------------------------------------------------------------
-
 echo -e "\nEnabling essential services"
 
 systemctl enable cups.service
@@ -44,3 +35,6 @@ sudo systemctl disable dhcpcd.service
 sudo systemctl stop dhcpcd.service
 sudo systemctl enable NetworkManager.service
 sudo systemctl enable bluetooth
+sudo systemctl enable ufw
+sudo systemctl enable fail2ban
+#sudo systemctl enable --now portmaster

dotfiles/fish/config.fish

@@ -31,3 +31,5 @@ set -g fish_color_valid_path --underline
 
 # Install Starship
 starship init fish | source
+
+### EOF ###