From d6954323b650b730301ffb1bcc93d5c73b11e7c6 Mon Sep 17 00:00:00 2001 From: stojshic Date: Mon, 24 Jan 2022 18:22:21 +0100 Subject: [PATCH 1/7] Added option to choose AUR helper --- 2-user.sh | 22 ++++++++++++---------- startup.sh | 13 ++++++++++++- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/2-user.sh b/2-user.sh index 27dba51..23a101e 100755 --- a/2-user.sh +++ b/2-user.sh @@ -17,17 +17,19 @@ Installing AUR Softwares # You can solve users running this script as root with this and then doing the same for the next for statement. However I will leave this up to you. source $HOME/ArchTitus/setup.conf -cd ~ -git clone "https://aur.archlinux.org/yay.git" -cd ~/yay -makepkg -si --noconfirm -cd ~ -touch "~/.cache/zshhistory" -git clone "https://github.com/ChrisTitusTech/zsh" -git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k -ln -s "~/zsh/.zshrc" ~/.zshrc + cd ~ + touch "~/.cache/zshhistory" + git clone "https://github.com/ChrisTitusTech/zsh" + git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k + ln -s "~/zsh/.zshrc" ~/.zshrc -yay -S --noconfirm --needed - < ~/ArchTitus/pkg-files/aur-pkgs.txt +if [[ ! $AUR_HELPER == none ]]; then + cd ~ + git clone "https://aur.archlinux.org/$AUR_HELPER.git" + cd ~/$AUR_HELPER + makepkg -si --noconfirm + $AUR_HELPER -S --noconfirm --needed - < ~/ArchTitus/pkg-files/aur-pkgs.txt +fi export PATH=$PATH:~/.local/bin cp -r ~/ArchTitus/dotfiles/* ~/.config/ diff --git a/startup.sh b/startup.sh index 5ea082d..d0c4c23 100755 --- a/startup.sh +++ b/startup.sh @@ -269,6 +269,14 @@ done read -rep "Please enter your hostname: " nameofmachine set_option NAME_OF_MACHINE $nameofmachine } + +aurhelper () { + echo -ne "Please enter your desired AUR helper:" + options=(paru yay picaur aura trizen pacaur none) + select_option $? 4 "${options[@]}" + aur_helper=${options[$?]} + set_option AUR_HELPER $aur_helper +} # More features in future # language (){} @@ -278,6 +286,9 @@ logo userinfo clear logo +aurhelper +clear +logo diskpart clear logo @@ -287,4 +298,4 @@ logo timezone clear logo -keymap \ No newline at end of file +keymap From 63ce0fc7963cd2c8c2fd1933faee68e887d3daa4 Mon Sep 17 00:00:00 2001 From: stojshic Date: Mon, 24 Jan 2022 19:50:20 +0100 Subject: [PATCH 2/7] Added option to choose DE --- 1-setup.sh | 2 +- 3-post-setup.sh | 44 ------------------------ 4-desktop.sh | 70 +++++++++++++++++++++++++++++++++++++++ archtitus.sh | 3 +- pkg-files/budgie.txt | 2 ++ pkg-files/cinnamon.txt | 3 ++ pkg-files/deepin.txt | 2 ++ pkg-files/gnome.txt | 4 +++ pkg-files/kde.txt | 32 ++++++++++++++++++ pkg-files/lxde.txt | 1 + pkg-files/mate.txt | 2 ++ pkg-files/openbox.txt | 40 ++++++++++++++++++++++ pkg-files/pacman-pkgs.txt | 35 +------------------- pkg-files/xfce.txt | 2 ++ startup.sh | 16 ++++++++- 15 files changed, 177 insertions(+), 81 deletions(-) create mode 100755 4-desktop.sh create mode 100644 pkg-files/budgie.txt create mode 100644 pkg-files/cinnamon.txt create mode 100644 pkg-files/deepin.txt create mode 100644 pkg-files/gnome.txt create mode 100644 pkg-files/kde.txt create mode 100644 pkg-files/lxde.txt create mode 100644 pkg-files/mate.txt create mode 100644 pkg-files/openbox.txt create mode 100644 pkg-files/xfce.txt diff --git a/1-setup.sh b/1-setup.sh index 3e56479..2b43143 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -26,7 +26,7 @@ echo -ne " ------------------------------------------------------------------------- " pacman -S --noconfirm pacman-contrib curl -pacman -S --noconfirm reflector rsync grub arch-install-scripts +pacman -S --noconfirm reflector rsync grub arch-install-scripts git cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak nc=$(grep -c ^processor /proc/cpuinfo) diff --git a/3-post-setup.sh b/3-post-setup.sh index 1fecd6c..bf533a8 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -41,47 +41,3 @@ echo "GRUB_THEME=\"${THEME_DIR}/${THEME_NAME}/theme.txt\"" >> /etc/default/grub echo -e "Updating grub..." grub-mkconfig -o /boot/grub/grub.cfg echo -e "All set!" - -echo -ne " -------------------------------------------------------------------------- - Enabling Login Display Manager -------------------------------------------------------------------------- -" -systemctl enable sddm.service -echo -ne " -------------------------------------------------------------------------- - Setting up SDDM Theme -------------------------------------------------------------------------- -" -cat < /etc/sddm.conf -[Theme] -Current=Nordic -EOF - -echo -ne " -------------------------------------------------------------------------- - Enabling Essential Services -------------------------------------------------------------------------- -" -systemctl enable cups.service -ntpd -qg -systemctl enable ntpd.service -systemctl disable dhcpcd.service -systemctl stop dhcpcd.service -systemctl enable NetworkManager.service -systemctl enable bluetooth -echo -ne " -------------------------------------------------------------------------- - Cleaning -------------------------------------------------------------------------- -" -# Remove no password sudo rights -sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers -# Add sudo rights -sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers - -rm -r /root/ArchTitus -rm -r /home/$USERNAME/ArchTitus - -# Replace in the same state -cd $pwd diff --git a/4-desktop.sh b/4-desktop.sh new file mode 100755 index 0000000..ea541d7 --- /dev/null +++ b/4-desktop.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash +echo -ne " +------------------------------------------------------------------------- + █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗ + ██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██║╚══██╔══╝██║ ██║██╔════╝ + ███████║██████╔╝██║ ███████║ ██║ ██║ ██║ ██║ ██║███████╗ + ██╔══██║██╔══██╗██║ ██╔══██║ ██║ ██║ ██║ ██║ ██║╚════██║ + ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║ + ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ +------------------------------------------------------------------------- + Automated Arch Linux Installer + SCRIPTHOME: ArchTitus +------------------------------------------------------------------------- + +------------------------------------------------------------------------- + Installing Desktop Enviroment +------------------------------------------------------------------------- +" + +source /root/ArchTitus/setup.conf + +cat /root/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line +do + echo "INSTALLING: ${line}" + sudo pacman -S --noconfirm --needed ${line} +done + +if [[ ${DESKTOP_ENV} == "kde" ]]; then + echo [Theme] >> /etc/sddm.conf + echo Current=Nordic >> /etc/sddm.conf + systemctl enable sddm.service + +elif [[ "${DESKTOP_ENV}" == "gnome" ]]; then + systemctl enable gdm.service + +elif [[ "${DESKTOP_ENV}" == "lxde" ]]; then + systemctl enable lxdm.service + +else + sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter + systemctl enable lightdm.service + +fi + +echo -ne " +------------------------------------------------------------------------- + Enabling Essential Services +------------------------------------------------------------------------- +" +systemctl enable cups.service +ntpd -qg +systemctl enable ntpd.service +systemctl disable dhcpcd.service +systemctl stop dhcpcd.service +systemctl enable NetworkManager.service +echo -ne " +------------------------------------------------------------------------- + Cleaning +------------------------------------------------------------------------- +" +# Remove no password sudo rights +sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers +# Add sudo rights +sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers + +rm -r /root/ArchTitus +rm -r /home/$USERNAME/ArchTitus + +# Replace in the same state +cd $pwd diff --git a/archtitus.sh b/archtitus.sh index e18bdd6..e718387 100755 --- a/archtitus.sh +++ b/archtitus.sh @@ -21,6 +21,7 @@ echo -ne " ( arch-chroot /mnt /root/ArchTitus/1-setup.sh )|& tee 1-setup.log ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh )|& tee 2-user.log ( arch-chroot /mnt /root/ArchTitus/3-post-setup.sh )|& tee 3-post-setup.log + ( arch-chroot /mnt /root/ArchTitus/4-desktop.sh )|& tee 4-desktop.log echo -ne " ------------------------------------------------------------------------- @@ -34,4 +35,4 @@ echo -ne " Automated Arch Linux Installer ------------------------------------------------------------------------- Done - Please Eject Install Media and Reboot -" \ No newline at end of file +" diff --git a/pkg-files/budgie.txt b/pkg-files/budgie.txt new file mode 100644 index 0000000..0ebe7d5 --- /dev/null +++ b/pkg-files/budgie.txt @@ -0,0 +1,2 @@ +budgie-desktop +gnome diff --git a/pkg-files/cinnamon.txt b/pkg-files/cinnamon.txt new file mode 100644 index 0000000..f0c8871 --- /dev/null +++ b/pkg-files/cinnamon.txt @@ -0,0 +1,3 @@ +cinnamon +metacity +gnome-shell diff --git a/pkg-files/deepin.txt b/pkg-files/deepin.txt new file mode 100644 index 0000000..7aa4d6a --- /dev/null +++ b/pkg-files/deepin.txt @@ -0,0 +1,2 @@ +deepin +deepin-extra diff --git a/pkg-files/gnome.txt b/pkg-files/gnome.txt new file mode 100644 index 0000000..d218836 --- /dev/null +++ b/pkg-files/gnome.txt @@ -0,0 +1,4 @@ +gnome +gnome-tweaks +dconf-editor +gnome-extras diff --git a/pkg-files/kde.txt b/pkg-files/kde.txt new file mode 100644 index 0000000..b0c40f0 --- /dev/null +++ b/pkg-files/kde.txt @@ -0,0 +1,32 @@ +ark +audiocd-kio +bluedevil +breeze +breeze-gtk +discover +dolphin +extra-cmake-modules +filelight +gwenview +kate +kde-gtk-config +kcodecs +kcoreaddons +kdeplasma-addons +kinfocenter +konsole +kscreen +kvantum-qt5 +layer-shell-qt +milou +okular +oxygen +plasma-desktop +plasma-nm +powerdevil +print-manager +sddm-kcm +spectacle +systemsettings +xdg-desktop-portal-kde +zeroconf-ioslave diff --git a/pkg-files/lxde.txt b/pkg-files/lxde.txt new file mode 100644 index 0000000..49be587 --- /dev/null +++ b/pkg-files/lxde.txt @@ -0,0 +1 @@ +lxde diff --git a/pkg-files/mate.txt b/pkg-files/mate.txt new file mode 100644 index 0000000..178264c --- /dev/null +++ b/pkg-files/mate.txt @@ -0,0 +1,2 @@ +mate +mate-extra diff --git a/pkg-files/openbox.txt b/pkg-files/openbox.txt new file mode 100644 index 0000000..a34a9a5 --- /dev/null +++ b/pkg-files/openbox.txt @@ -0,0 +1,40 @@ +openbox +lightdm +lightdm-gtk-greeter +alsa-utils +pulseaudio +pulseaudio-alsa +wireless_tools +zsh +dunst +tint2 +rofi +feh +lxappearance +qt5ct +lxsession +gsimplecal +xautolock +xclip +scrot +thunar +thunar-archive-plugin +thunar-volman +thunar-media-tags-plugin +tumbler +jq +w3m +geany +nano +viewnior +viewnior +pavucontrol +parcellite +neofetch +htop +picom +gtk2-perl +xfce4-power-manager +imagemagick +playerctl +xsettingsd diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt index 42bf817..e58a5c4 100644 --- a/pkg-files/pacman-pkgs.txt +++ b/pkg-files/pacman-pkgs.txt @@ -6,11 +6,8 @@ xorg-drivers xorg-xkill xorg-xinit xterm -plasma-desktop alsa-plugins alsa-utils -ark -audiocd-kio autoconf automake base @@ -18,12 +15,9 @@ bash-completion bind binutils bison -bluedevil bluez bluez-libs bluez-utils -breeze -breeze-gtk bridge-utils btrfs-progs celluloid @@ -32,15 +26,11 @@ code cronie cups dialog -discover -dolphin dosfstools dtc efibootmgr egl-wayland exfat-utils -extra-cmake-modules -filelight flex fuse2 fuse3 @@ -56,23 +46,11 @@ grub-customizer gst-libav gst-plugins-good gst-plugins-ugly -gwenview haveged htop iptables-nft jdk-openjdk -kate -kcodecs -kcoreaddons -kde-plasma-addons -kinfocenter -kscreen -kvantum-qt5 -kde-gtk-config kitty -konsole -kscreen -layer-shell-qt libdvdcss libnewt libtool @@ -84,26 +62,20 @@ lutris lzop m4 make -milou nano neofetch networkmanager ntfs-3g ntp -okular openbsd-netcat openssh os-prober -oxygen p7zip pacman-contrib patch picom pkgconf -plasma-nm -powerdevil powerline-fonts -print-manager pulseaudio pulseaudio-alsa pulseaudio-bluetooth @@ -114,14 +86,11 @@ python-pip qemu rsync sddm -sddm-kcm snapper -spectacle steam sudo swtpm synergy -systemsettings terminus-font traceroute ufw @@ -136,10 +105,8 @@ which wine-gecko wine-mono winetricks -xdg-desktop-portal-kde xdg-user-dirs -zeroconf-ioslave zip zsh zsh-syntax-highlighting -zsh-autosuggestions \ No newline at end of file +zsh-autosuggestions diff --git a/pkg-files/xfce.txt b/pkg-files/xfce.txt new file mode 100644 index 0000000..87200da --- /dev/null +++ b/pkg-files/xfce.txt @@ -0,0 +1,2 @@ +xfce4 +xfce-goodies diff --git a/startup.sh b/startup.sh index d0c4c23..612bbb4 100755 --- a/startup.sh +++ b/startup.sh @@ -271,12 +271,23 @@ set_option NAME_OF_MACHINE $nameofmachine } aurhelper () { - echo -ne "Please enter your desired AUR helper:" + # Let the user choose AUR helper from predefined list + echo -ne "Please enter your desired AUR helper:\n" options=(paru yay picaur aura trizen pacaur none) select_option $? 4 "${options[@]}" aur_helper=${options[$?]} set_option AUR_HELPER $aur_helper } + +desktopenv () { + # Let the user choose Desktop Enviroment from predefined list + echo -ne "Please select your desired Desktop Enviroment:\n" + options=(gnome kde cinnamon xfce mate budgie lxde deepin openbox) + select_option $? 4 "${options[@]}" + desktop_env=${options[$?]} + set_option DESKTOP_ENV $desktop_env +} + # More features in future # language (){} @@ -286,6 +297,9 @@ logo userinfo clear logo +desktopenv +clear +logo aurhelper clear logo From d13f9f787737cd347c3f79bacf9a47258020de20 Mon Sep 17 00:00:00 2001 From: stojshic Date: Tue, 25 Jan 2022 15:53:51 +0100 Subject: [PATCH 3/7] Added option to choose between minimal/full installation --- 1-setup.sh | 12 +++++++++--- 2-user.sh | 24 ++++++++++++++++++------ 4-desktop.sh | 21 ++++++++++++++++++--- archtitus.sh | 4 +++- pkg-files/aur-pkgs.txt | 9 +-------- pkg-files/budgie.txt | 1 + pkg-files/cinnamon.txt | 1 + pkg-files/deepin.txt | 1 + pkg-files/gnome.txt | 3 +-- pkg-files/kde.txt | 8 +++++--- pkg-files/lxde.txt | 1 + pkg-files/mate.txt | 1 + pkg-files/openbox.txt | 9 ++++++--- pkg-files/pacman-pkgs.txt | 35 +++++++++++++++++++++-------------- pkg-files/server.txt | 1 + pkg-files/xfce.txt | 1 + startup.sh | 26 ++++++++++++++++++++++---- 17 files changed, 111 insertions(+), 47 deletions(-) create mode 100644 pkg-files/server.txt diff --git a/1-setup.sh b/1-setup.sh index 2b43143..fb94c5e 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -71,10 +71,16 @@ echo -ne " Installing Base System ------------------------------------------------------------------------- " -cat /root/ArchTitus/pkg-files/pacman-pkgs.txt | while read line +# sed $INSTALL_TYPE is using install typeto check for MINIMAL installation, if it's true, stop +# stop the script and move on, not installing any more packages below that line +sed -n '/'$INSTALL_TYPE'/q;p' /root/ArchTitus/pkg-files/pacman-pkgs.txt | while read line do - echo "INSTALLING: ${line}" - sudo pacman -S --noconfirm --needed ${line} + if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]; then + # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line + continue + fi + echo "INSTALLING: ${line}" + sudo pacman -S --noconfirm --needed ${line} done echo -ne " ------------------------------------------------------------------------- diff --git a/2-user.sh b/2-user.sh index 23a101e..06e6ca9 100755 --- a/2-user.sh +++ b/2-user.sh @@ -28,15 +28,27 @@ if [[ ! $AUR_HELPER == none ]]; then git clone "https://aur.archlinux.org/$AUR_HELPER.git" cd ~/$AUR_HELPER makepkg -si --noconfirm - $AUR_HELPER -S --noconfirm --needed - < ~/ArchTitus/pkg-files/aur-pkgs.txt + # sed $INSTALL_TYPE is using install typeto check for MINIMAL installation, if it's true, stop + # stop the script and move on, not installing any more packages below that line + sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/aur-pkgs.txt | while read line + do + if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]; then + # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line + continue + fi + echo "INSTALLING: ${line}" + $AUR_HELPER -S --noconfirm --needed ${line} + done fi export PATH=$PATH:~/.local/bin -cp -r ~/ArchTitus/dotfiles/* ~/.config/ -pip install konsave -konsave -i ~/ArchTitus/kde.knsv -sleep 1 -konsave -a kde +if [[ $DESKTOP_ENV == "kde" ]] && [[ $INSTALL_TYPE == "FULL" ]]; then + cp -r ~/ArchTitus/dotfiles/* ~/.config/ + pip install konsave + konsave -i ~/ArchTitus/kde.knsv + sleep 1 + konsave -a kde +fi echo -ne " ------------------------------------------------------------------------- diff --git a/4-desktop.sh b/4-desktop.sh index ea541d7..466ad90 100755 --- a/4-desktop.sh +++ b/4-desktop.sh @@ -19,16 +19,23 @@ echo -ne " source /root/ArchTitus/setup.conf -cat /root/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line +sed -n '/'$INSTALL_TYPE'/q;p' /root/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line do + if [[ ${line} == '--END OF MINIMAL INSTALL--' ]] + then + # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line + continue + fi echo "INSTALLING: ${line}" sudo pacman -S --noconfirm --needed ${line} done if [[ ${DESKTOP_ENV} == "kde" ]]; then - echo [Theme] >> /etc/sddm.conf - echo Current=Nordic >> /etc/sddm.conf systemctl enable sddm.service + if [[ ${INSTALL_TYPE} == "FULL" ]]; then + echo [Theme] >> /etc/sddm.conf + echo Current=Nordic >> /etc/sddm.conf + fi elif [[ "${DESKTOP_ENV}" == "gnome" ]]; then systemctl enable gdm.service @@ -36,6 +43,14 @@ elif [[ "${DESKTOP_ENV}" == "gnome" ]]; then elif [[ "${DESKTOP_ENV}" == "lxde" ]]; then systemctl enable lxdm.service +elif [[ "${DESKTOP_ENV}" == "openbox" ]]; then + sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter + systemctl enable lightdm.service + if [[ "${INSTALL_TYPE}" == "FULL" ]]; then + git clone https://github.com/stojshic/dotfiles-openbox + ./dotfiles-openbox/install.sh + fi + else sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter systemctl enable lightdm.service diff --git a/archtitus.sh b/archtitus.sh index e718387..ad57eea 100755 --- a/archtitus.sh +++ b/archtitus.sh @@ -19,7 +19,9 @@ echo -ne " source $SCRIPT_DIR/setup.conf ( bash 0-preinstall.sh )|& tee 0-preinstall.log ( arch-chroot /mnt /root/ArchTitus/1-setup.sh )|& tee 1-setup.log - ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh )|& tee 2-user.log + if [[ ! $DESKTOP_ENV == server ]]; then + ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh )|& tee 2-user.log + fi ( arch-chroot /mnt /root/ArchTitus/3-post-setup.sh )|& tee 3-post-setup.log ( arch-chroot /mnt /root/ArchTitus/4-desktop.sh )|& tee 4-desktop.log diff --git a/pkg-files/aur-pkgs.txt b/pkg-files/aur-pkgs.txt index 8179d7a..c66c1be 100644 --- a/pkg-files/aur-pkgs.txt +++ b/pkg-files/aur-pkgs.txt @@ -1,5 +1,5 @@ +--END OF MINIMAL INSTALL-- autojump -awesome-terminal-fonts brave-bin dxvk-bin github-desktop-bin @@ -12,15 +12,8 @@ nordic-darker-standard-buttons-theme nordic-darker-theme nordic-kde-git nordic-theme -noto-fonts-emoji -papirus-icon-theme -plasma-pa ocs-url sddm-nordic-theme-git snapper-gui-git -ttf-droid -ttf-hack ttf-meslo -ttf-roboto zoom -snap-pac \ No newline at end of file diff --git a/pkg-files/budgie.txt b/pkg-files/budgie.txt index 0ebe7d5..ab7873d 100644 --- a/pkg-files/budgie.txt +++ b/pkg-files/budgie.txt @@ -1,2 +1,3 @@ budgie-desktop gnome +--END OF MINIMAL INSTALL-- diff --git a/pkg-files/cinnamon.txt b/pkg-files/cinnamon.txt index f0c8871..7fa604f 100644 --- a/pkg-files/cinnamon.txt +++ b/pkg-files/cinnamon.txt @@ -1,3 +1,4 @@ cinnamon metacity gnome-shell +--END OF MINIMAL INSTALL-- diff --git a/pkg-files/deepin.txt b/pkg-files/deepin.txt index 7aa4d6a..9c01f73 100644 --- a/pkg-files/deepin.txt +++ b/pkg-files/deepin.txt @@ -1,2 +1,3 @@ deepin deepin-extra +--END OF MINIMAL INSTALL-- diff --git a/pkg-files/gnome.txt b/pkg-files/gnome.txt index d218836..24ca95a 100644 --- a/pkg-files/gnome.txt +++ b/pkg-files/gnome.txt @@ -1,4 +1,3 @@ gnome -gnome-tweaks -dconf-editor +--END OF MINIMAL INSTALL-- gnome-extras diff --git a/pkg-files/kde.txt b/pkg-files/kde.txt index b0c40f0..d876134 100644 --- a/pkg-files/kde.txt +++ b/pkg-files/kde.txt @@ -1,10 +1,13 @@ +plasma-desktop +sddm +dolphin +--END OF MINIMAL INSTALL-- ark audiocd-kio bluedevil breeze breeze-gtk discover -dolphin extra-cmake-modules filelight gwenview @@ -21,11 +24,10 @@ layer-shell-qt milou okular oxygen -plasma-desktop plasma-nm +plasma-pa powerdevil print-manager -sddm-kcm spectacle systemsettings xdg-desktop-portal-kde diff --git a/pkg-files/lxde.txt b/pkg-files/lxde.txt index 49be587..c39843f 100644 --- a/pkg-files/lxde.txt +++ b/pkg-files/lxde.txt @@ -1 +1,2 @@ lxde +--END OF MINIMAL INSTALL-- diff --git a/pkg-files/mate.txt b/pkg-files/mate.txt index 178264c..736ee37 100644 --- a/pkg-files/mate.txt +++ b/pkg-files/mate.txt @@ -1,2 +1,3 @@ mate mate-extra +--END OF MINIMAL INSTALL-- diff --git a/pkg-files/openbox.txt b/pkg-files/openbox.txt index a34a9a5..932654d 100644 --- a/pkg-files/openbox.txt +++ b/pkg-files/openbox.txt @@ -1,6 +1,10 @@ openbox lightdm lightdm-gtk-greeter +thunar +lxsession +rxvt-unicode +--END OF MINIMAL INSTALL-- alsa-utils pulseaudio pulseaudio-alsa @@ -12,12 +16,10 @@ rofi feh lxappearance qt5ct -lxsession gsimplecal xautolock xclip scrot -thunar thunar-archive-plugin thunar-volman thunar-media-tags-plugin @@ -27,7 +29,6 @@ w3m geany nano viewnior -viewnior pavucontrol parcellite neofetch @@ -38,3 +39,5 @@ xfce4-power-manager imagemagick playerctl xsettingsd +obconf + diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt index e58a5c4..b46a767 100644 --- a/pkg-files/pacman-pkgs.txt +++ b/pkg-files/pacman-pkgs.txt @@ -6,14 +6,28 @@ xorg-drivers xorg-xkill xorg-xinit xterm +base +binutils +dosfstools +grub +iptables-nft +linux +linux-firmware +linux-headers +networkmanager +noto-fonts-emoji +sudo +usbutils +vim +xdg-user-dirs +--END OF MINIMAL INSTALL-- alsa-plugins alsa-utils autoconf automake -base +awesome-terminal-fonts bash-completion bind -binutils bison bluez bluez-libs @@ -26,7 +40,6 @@ code cronie cups dialog -dosfstools dtc efibootmgr egl-wayland @@ -41,22 +54,17 @@ gimp git gparted gptfdisk -grub grub-customizer gst-libav gst-plugins-good gst-plugins-ugly haveged htop -iptables-nft jdk-openjdk kitty libdvdcss libnewt libtool -linux -linux-firmware -linux-headers lsof lutris lzop @@ -64,7 +72,6 @@ m4 make nano neofetch -networkmanager ntfs-3g ntp openbsd-netcat @@ -72,6 +79,7 @@ openssh os-prober p7zip pacman-contrib +papirus-icon-theme patch picom pkgconf @@ -85,19 +93,19 @@ python-pyqt5 python-pip qemu rsync -sddm +snap-pack snapper steam -sudo swtpm synergy terminus-font traceroute +ttf-droid +ttf-hack +ttf-roboto ufw unrar unzip -usbutils -vim virt-manager virt-viewer wget @@ -105,7 +113,6 @@ which wine-gecko wine-mono winetricks -xdg-user-dirs zip zsh zsh-syntax-highlighting diff --git a/pkg-files/server.txt b/pkg-files/server.txt new file mode 100644 index 0000000..0596bf6 --- /dev/null +++ b/pkg-files/server.txt @@ -0,0 +1 @@ +--END OF MINIMAL INSTALL-- diff --git a/pkg-files/xfce.txt b/pkg-files/xfce.txt index 87200da..953826a 100644 --- a/pkg-files/xfce.txt +++ b/pkg-files/xfce.txt @@ -1,2 +1,3 @@ xfce4 xfce-goodies +--END OF MINIMAL INSTALL-- diff --git a/startup.sh b/startup.sh index 612bbb4..7f76044 100755 --- a/startup.sh +++ b/startup.sh @@ -282,12 +282,22 @@ aurhelper () { desktopenv () { # Let the user choose Desktop Enviroment from predefined list echo -ne "Please select your desired Desktop Enviroment:\n" - options=(gnome kde cinnamon xfce mate budgie lxde deepin openbox) + options=(gnome kde cinnamon xfce mate budgie lxde deepin openbox server) select_option $? 4 "${options[@]}" desktop_env=${options[$?]} set_option DESKTOP_ENV $desktop_env } +installtype () { + echo -ne "Please select type of installation:\n\n + Full install: Installs full featured desktop enviroment, with added apps and themes needed for everyday use\n + Minimal Install: Installs only apps few selected apps to get you started\n" + options=(FULL MINIMAL) + select_option $? 4 "${options[@]}" + install_type=${options[$?]} + set_option INSTALL_TYPE $install_type +} + # More features in future # language (){} @@ -298,9 +308,17 @@ userinfo clear logo desktopenv -clear -logo -aurhelper +# Set fixed options that installation uses if user choses server installation +set_option INSTALL_TYPE MINIMAL +set_option AUR_HELPER NONE +if [[ ! $desktop_env == server ]]; then + clear + logo + aurhelper + clear + logo + installtype +fi clear logo diskpart From fdb4a97537f3bbf4fdd7d22c504fcb19feee1fa2 Mon Sep 17 00:00:00 2001 From: stojshic Date: Wed, 26 Jan 2022 19:56:20 +0100 Subject: [PATCH 4/7] Merged 4-dekstop to 2-user and 3-post-setup --- 1-setup.sh | 22 +++++------ 2-user.sh | 34 +++++++++++++---- 3-post-setup.sh | 64 +++++++++++++++++++++++++++++++- 4-desktop.sh | 85 ------------------------------------------- archtitus.sh | 1 - pkg-files/openbox.txt | 3 +- pkg-files/server.txt | 1 - 7 files changed, 103 insertions(+), 107 deletions(-) delete mode 100755 4-desktop.sh delete mode 100644 pkg-files/server.txt diff --git a/1-setup.sh b/1-setup.sh index fb94c5e..9b172e7 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -18,15 +18,15 @@ echo -ne " Network Setup ------------------------------------------------------------------------- " -pacman -S networkmanager dhclient --noconfirm --needed +pacman -S --noconfirm --needed networkmanager dhclient systemctl enable --now NetworkManager echo -ne " ------------------------------------------------------------------------- Setting up mirrors for optimal download ------------------------------------------------------------------------- " -pacman -S --noconfirm pacman-contrib curl -pacman -S --noconfirm reflector rsync grub arch-install-scripts git +pacman -S --noconfirm --needed pacman-contrib curl +pacman -S --noconfirm --needed reflector rsync grub arch-install-scripts git cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak nc=$(grep -c ^processor /proc/cpuinfo) @@ -64,14 +64,14 @@ sed -i 's/^#ParallelDownloads/ParallelDownloads/' /etc/pacman.conf #Enable multilib sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf -pacman -Sy --noconfirm +pacman -Sy --noconfirm --needed echo -ne " ------------------------------------------------------------------------- Installing Base System ------------------------------------------------------------------------- " -# sed $INSTALL_TYPE is using install typeto check for MINIMAL installation, if it's true, stop +# sed $INSTALL_TYPE is using install type to check for MINIMAL installation, if it's true, stop # stop the script and move on, not installing any more packages below that line sed -n '/'$INSTALL_TYPE'/q;p' /root/ArchTitus/pkg-files/pacman-pkgs.txt | while read line do @@ -91,11 +91,11 @@ echo -ne " proc_type=$(lscpu) if grep -E "GenuineIntel" <<< ${proc_type}; then echo "Installing Intel microcode" - pacman -S --noconfirm intel-ucode + pacman -S --noconfirm --needed intel-ucode proc_ucode=intel-ucode.img elif grep -E "AuthenticAMD" <<< ${proc_type}; then echo "Installing AMD microcode" - pacman -S --noconfirm amd-ucode + pacman -S --noconfirm --needed amd-ucode proc_ucode=amd-ucode.img fi @@ -107,14 +107,14 @@ echo -ne " # Graphics Drivers find and install gpu_type=$(lspci) if grep -E "NVIDIA|GeForce" <<< ${gpu_type}; then - pacman -S nvidia --noconfirm --needed + pacman -S --noconfirm --needed nvidia nvidia-xconfig elif lspci | grep 'VGA' | grep -E "Radeon|AMD"; then - pacman -S xf86-video-amdgpu --noconfirm --needed + pacman -S --noconfirm --needed xf86-video-amdgpu elif grep -E "Integrated Graphics Controller" <<< ${gpu_type}; then - pacman -S libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa --needed --noconfirm + pacman -S --noconfirm --needed libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa elif grep -E "Intel Corporation UHD" <<< ${gpu_type}; then - pacman -S libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa --needed --noconfirm + pacman -S --needed --noconfirm libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa fi #SETUP IS WRONG THIS IS RUN if ! source /root/ArchTitus/setup.conf; then diff --git a/2-user.sh b/2-user.sh index 06e6ca9..a9ddc0e 100755 --- a/2-user.sh +++ b/2-user.sh @@ -23,12 +23,24 @@ source $HOME/ArchTitus/setup.conf git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k ln -s "~/zsh/.zshrc" ~/.zshrc +sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line +do + if [[ ${line} == '--END OF MINIMAL INSTALL--' ]] + then + # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line + continue + fi + echo "INSTALLING: ${line}" + sudo pacman -S --noconfirm --needed ${line} +done + + if [[ ! $AUR_HELPER == none ]]; then cd ~ git clone "https://aur.archlinux.org/$AUR_HELPER.git" cd ~/$AUR_HELPER makepkg -si --noconfirm - # sed $INSTALL_TYPE is using install typeto check for MINIMAL installation, if it's true, stop + # sed $INSTALL_TYPE is using install type to check for MINIMAL installation, if it's true, stop # stop the script and move on, not installing any more packages below that line sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/aur-pkgs.txt | while read line do @@ -42,12 +54,20 @@ if [[ ! $AUR_HELPER == none ]]; then fi export PATH=$PATH:~/.local/bin -if [[ $DESKTOP_ENV == "kde" ]] && [[ $INSTALL_TYPE == "FULL" ]]; then - cp -r ~/ArchTitus/dotfiles/* ~/.config/ - pip install konsave - konsave -i ~/ArchTitus/kde.knsv - sleep 1 - konsave -a kde + +# Theming DE if user chose FULL installation +if [[ $INSTALL_TYPE == "FULL" ]]; then + if [[ $DESKTOP_ENV == "kde" ]]; then + cp -r ~/ArchTitus/dotfiles/* ~/.config/ + pip install konsave + konsave -i ~/ArchTitus/kde.knsv + sleep 1 + konsave -a kde + elif [[ $DESKTOP_ENV == "openbox" ]]; then + cd ~ + git clone https://github.com/stojshic/dotfiles-openbox + ./dotfiles-openbox/install-titus.sh + fi fi echo -ne " diff --git a/3-post-setup.sh b/3-post-setup.sh index bf533a8..41e6cc9 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -16,7 +16,7 @@ Final Setup and Configurations GRUB EFI Bootloader Install & Check " source /root/ArchTitus/setup.conf -genfstab -U /mnt >> /mnt/etc/fstab +genfstab -U /mnt >> /etc/fstab if [[ -d "/sys/firmware/efi" ]]; then grub-install --efi-directory=/boot ${DISK} fi @@ -41,3 +41,65 @@ echo "GRUB_THEME=\"${THEME_DIR}/${THEME_NAME}/theme.txt\"" >> /etc/default/grub echo -e "Updating grub..." grub-mkconfig -o /boot/grub/grub.cfg echo -e "All set!" + +echo -ne " +------------------------------------------------------------------------- + Enabling (and Theming) Login Display Manager +------------------------------------------------------------------------- +" +if [[ ${DESKTOP_ENV} == "kde" ]]; then + systemctl enable sddm.service + if [[ ${INSTALL_TYPE} == "FULL" ]]; then + echo [Theme] >> /etc/sddm.conf + echo Current=Nordic >> /etc/sddm.conf + fi + +elif [[ "${DESKTOP_ENV}" == "gnome" ]]; then + systemctl enable gdm.service + +elif [[ "${DESKTOP_ENV}" == "lxde" ]]; then + systemctl enable lxdm.service + +elif [[ "${DESKTOP_ENV}" == "openbox" ]]; then + systemctl enable lightdm.service + if [[ "${INSTALL_TYPE}" == "FULL" ]]; then + # Set default lightdm-webkit2-greeter theme to Litarvan + sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = litarvan #\1/g' /etc/lightdm/lightdm-webkit2-greeter.conf + # Set default lightdm greeter to lightdm-webkit2-greeter + sed -i 's/#greeter-session=example.*/greeter-session=lightdm-webkit2-greeter/g' /etc/lightdm/lightdm.conf + fi + +else + if [[ ! "${DESKTOP_ENV}" == "server" ]]; then + sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter + systemctl enable lightdm.service + fi +fi + +echo -ne " +------------------------------------------------------------------------- + Enabling Essential Services +------------------------------------------------------------------------- +" +systemctl enable cups.service +ntpd -qg +systemctl enable ntpd.service +systemctl disable dhcpcd.service +systemctl stop dhcpcd.service +systemctl enable NetworkManager.service +systemctl enable bluetooth +echo -ne " +------------------------------------------------------------------------- + Cleaning +------------------------------------------------------------------------- +" +# Remove no password sudo rights +sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers +# Add sudo rights +sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers + +rm -r /root/ArchTitus +rm -r /home/$USERNAME/ArchTitus + +# Replace in the same state +cd $pwd diff --git a/4-desktop.sh b/4-desktop.sh deleted file mode 100755 index 466ad90..0000000 --- a/4-desktop.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env bash -echo -ne " -------------------------------------------------------------------------- - █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗ - ██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██║╚══██╔══╝██║ ██║██╔════╝ - ███████║██████╔╝██║ ███████║ ██║ ██║ ██║ ██║ ██║███████╗ - ██╔══██║██╔══██╗██║ ██╔══██║ ██║ ██║ ██║ ██║ ██║╚════██║ - ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║ - ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ -------------------------------------------------------------------------- - Automated Arch Linux Installer - SCRIPTHOME: ArchTitus -------------------------------------------------------------------------- - -------------------------------------------------------------------------- - Installing Desktop Enviroment -------------------------------------------------------------------------- -" - -source /root/ArchTitus/setup.conf - -sed -n '/'$INSTALL_TYPE'/q;p' /root/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line -do - if [[ ${line} == '--END OF MINIMAL INSTALL--' ]] - then - # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line - continue - fi - echo "INSTALLING: ${line}" - sudo pacman -S --noconfirm --needed ${line} -done - -if [[ ${DESKTOP_ENV} == "kde" ]]; then - systemctl enable sddm.service - if [[ ${INSTALL_TYPE} == "FULL" ]]; then - echo [Theme] >> /etc/sddm.conf - echo Current=Nordic >> /etc/sddm.conf - fi - -elif [[ "${DESKTOP_ENV}" == "gnome" ]]; then - systemctl enable gdm.service - -elif [[ "${DESKTOP_ENV}" == "lxde" ]]; then - systemctl enable lxdm.service - -elif [[ "${DESKTOP_ENV}" == "openbox" ]]; then - sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter - systemctl enable lightdm.service - if [[ "${INSTALL_TYPE}" == "FULL" ]]; then - git clone https://github.com/stojshic/dotfiles-openbox - ./dotfiles-openbox/install.sh - fi - -else - sudo pacman -S --noconfirm --needed lightdm lightdm-gtk-greeter - systemctl enable lightdm.service - -fi - -echo -ne " -------------------------------------------------------------------------- - Enabling Essential Services -------------------------------------------------------------------------- -" -systemctl enable cups.service -ntpd -qg -systemctl enable ntpd.service -systemctl disable dhcpcd.service -systemctl stop dhcpcd.service -systemctl enable NetworkManager.service -echo -ne " -------------------------------------------------------------------------- - Cleaning -------------------------------------------------------------------------- -" -# Remove no password sudo rights -sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers -# Add sudo rights -sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers - -rm -r /root/ArchTitus -rm -r /home/$USERNAME/ArchTitus - -# Replace in the same state -cd $pwd diff --git a/archtitus.sh b/archtitus.sh index ad57eea..efd3d28 100755 --- a/archtitus.sh +++ b/archtitus.sh @@ -23,7 +23,6 @@ echo -ne " ( arch-chroot /mnt /usr/bin/runuser -u $USERNAME -- /home/$USERNAME/ArchTitus/2-user.sh )|& tee 2-user.log fi ( arch-chroot /mnt /root/ArchTitus/3-post-setup.sh )|& tee 3-post-setup.log - ( arch-chroot /mnt /root/ArchTitus/4-desktop.sh )|& tee 4-desktop.log echo -ne " ------------------------------------------------------------------------- diff --git a/pkg-files/openbox.txt b/pkg-files/openbox.txt index 932654d..078ef39 100644 --- a/pkg-files/openbox.txt +++ b/pkg-files/openbox.txt @@ -1,6 +1,6 @@ openbox lightdm -lightdm-gtk-greeter +lightdm-webkit2-greeter thunar lxsession rxvt-unicode @@ -14,6 +14,7 @@ dunst tint2 rofi feh +lightdm-webkit-theme-litarvan lxappearance qt5ct gsimplecal diff --git a/pkg-files/server.txt b/pkg-files/server.txt deleted file mode 100644 index 0596bf6..0000000 --- a/pkg-files/server.txt +++ /dev/null @@ -1 +0,0 @@ ---END OF MINIMAL INSTALL-- From 2940bbd5c6b55db2d1ae5004c4001630f2fed4e6 Mon Sep 17 00:00:00 2001 From: stojshic Date: Wed, 26 Jan 2022 20:06:58 +0100 Subject: [PATCH 5/7] Reverted to installing only gtk-greeter for openbox if minimal installation, and Webkit2 only in full installation --- pkg-files/openbox.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg-files/openbox.txt b/pkg-files/openbox.txt index 078ef39..34ea690 100644 --- a/pkg-files/openbox.txt +++ b/pkg-files/openbox.txt @@ -1,6 +1,6 @@ openbox lightdm -lightdm-webkit2-greeter +lightdm-gtk-greeter thunar lxsession rxvt-unicode @@ -14,6 +14,7 @@ dunst tint2 rofi feh +lightdm-webkit2-greeter lightdm-webkit-theme-litarvan lxappearance qt5ct From 03e2e79c2e7c06bbc68c6f537241a94a909b471b Mon Sep 17 00:00:00 2001 From: stojshic Date: Wed, 26 Jan 2022 20:41:36 +0100 Subject: [PATCH 6/7] Cleaning up duplicate files from pacman-pkgs that were already installed --- 1-setup.sh | 20 +++++++++++--------- pkg-files/pacman-pkgs.txt | 13 ------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/1-setup.sh b/1-setup.sh index 9b172e7..db817dd 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -73,15 +73,17 @@ echo -ne " " # sed $INSTALL_TYPE is using install type to check for MINIMAL installation, if it's true, stop # stop the script and move on, not installing any more packages below that line -sed -n '/'$INSTALL_TYPE'/q;p' /root/ArchTitus/pkg-files/pacman-pkgs.txt | while read line -do - if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]; then - # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line - continue - fi - echo "INSTALLING: ${line}" - sudo pacman -S --noconfirm --needed ${line} -done +if [[ ! $DESKTOP_ENV == server ]]; then + sed -n '/'$INSTALL_TYPE'/q;p' /root/ArchTitus/pkg-files/pacman-pkgs.txt | while read line + do + if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]; then + # If selected installation type is FULL, skip the --END OF THE MINIMAL INSTALLATION-- line + continue + fi + echo "INSTALLING: ${line}" + sudo pacman -S --noconfirm --needed ${line} + done +fi echo -ne " ------------------------------------------------------------------------- Installing Microcode diff --git a/pkg-files/pacman-pkgs.txt b/pkg-files/pacman-pkgs.txt index b46a767..8634b6a 100644 --- a/pkg-files/pacman-pkgs.txt +++ b/pkg-files/pacman-pkgs.txt @@ -6,19 +6,12 @@ xorg-drivers xorg-xkill xorg-xinit xterm -base binutils dosfstools -grub iptables-nft -linux -linux-firmware linux-headers -networkmanager noto-fonts-emoji -sudo usbutils -vim xdg-user-dirs --END OF MINIMAL INSTALL-- alsa-plugins @@ -51,7 +44,6 @@ fuseiso gamemode gcc gimp -git gparted gptfdisk grub-customizer @@ -63,14 +55,12 @@ htop jdk-openjdk kitty libdvdcss -libnewt libtool lsof lutris lzop m4 make -nano neofetch ntfs-3g ntp @@ -78,7 +68,6 @@ openbsd-netcat openssh os-prober p7zip -pacman-contrib papirus-icon-theme patch picom @@ -92,7 +81,6 @@ python-psutil python-pyqt5 python-pip qemu -rsync snap-pack snapper steam @@ -108,7 +96,6 @@ unrar unzip virt-manager virt-viewer -wget which wine-gecko wine-mono From 0182c17afe10f8f8a92cfa4a6b57e60f3c0ca22b Mon Sep 17 00:00:00 2001 From: stojshic Date: Wed, 26 Jan 2022 21:13:15 +0100 Subject: [PATCH 7/7] Genfstab still gave me some errors, even tho everything worked. This modification removed error for me --- 0-preinstall.sh | 6 +++--- 3-post-setup.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/0-preinstall.sh b/0-preinstall.sh index a4afd5a..e77959d 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -25,10 +25,10 @@ Setting up mirrors for optimal download source setup.conf iso=$(curl -4 ifconfig.co/country-iso) timedatectl set-ntp true -pacman -S --noconfirm pacman-contrib terminus-font +pacman -S --noconfirm --needed pacman-contrib terminus-font setfont ter-v22b sed -i 's/^#ParallelDownloads/ParallelDownloads/' /etc/pacman.conf -pacman -S --noconfirm reflector rsync grub +pacman -S --noconfirm --needed reflector rsync grub cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup echo -ne " ------------------------------------------------------------------------- @@ -42,7 +42,7 @@ echo -ne " Installing Prerequisites ------------------------------------------------------------------------- " -pacman -S --noconfirm gptfdisk btrfs-progs +pacman -S --noconfirm --needed gptfdisk btrfs-progs echo -ne " ------------------------------------------------------------------------- Formating Disk diff --git a/3-post-setup.sh b/3-post-setup.sh index 41e6cc9..9d99e23 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -16,7 +16,7 @@ Final Setup and Configurations GRUB EFI Bootloader Install & Check " source /root/ArchTitus/setup.conf -genfstab -U /mnt >> /etc/fstab +genfstab -U -p / >> /etc/fstab if [[ -d "/sys/firmware/efi" ]]; then grub-install --efi-directory=/boot ${DISK} fi