From 2893f666557d1b84a333965c7f94d480317ced02 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Sun, 2 Jan 2022 12:42:55 -0300
Subject: [PATCH] Add semi-important packages and update packages.csv

---
 install.sh   | 30 ++++++++++++++----------------
 packages.csv | 24 ++++++++++++------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/install.sh b/install.sh
index da2c9ec..45d7b32 100755
--- a/install.sh
+++ b/install.sh
@@ -146,6 +146,7 @@ checkForParu() {
     commOutput=$(runInChroot "command -v paru > /dev/null 2>&1 || echo 1")
     if [ "$commOutput" = "1" ]; then
         runInChroot "sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers"
+        [ -z $username ] && loadUsername
         runInChroot "cd /tmp; sudo -u $username git clone https://aur.archlinux.org/paru-bin.git; cd paru-bin; sudo -u $username makepkg -si --noconfirm; cd ..; rm -rf paru-bin" 2>&1 | debug
     fi
 }
@@ -299,13 +300,11 @@ EOF
     return $?
 }
 
-installNotImportantPackages() {
+installOtherPackages() {
     calcHeightAndRun "whiptail --msgbox \"Now, we will install a few more packages (in the background). Press OK and wait (it may take some time).\" HEIGHT 60 3>&1 1>&2 2>&3"
-    [ -z $username ] && loadUsername
-    # TODO: Add "S" packages that will be the ones that depend on locale: base-devel and git.
-    # getThePackages "S" "installNotImportantPackages"
+    getThePackages "S" "installOtherPackages"
     checkForParu
-    getThePackages "N" "installNotImportantPackages"
+    getThePackages "N" "installOtherPackages"
     runInChroot "sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers"
 }
 
@@ -324,10 +323,9 @@ finishInstallation() {
 
 zshConfig() {
     # TODO: Choose between zsh-theme-powerlevel10k-git (AUR) and zsh-theme-powerlevel10k (community)
-    sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended 2>&1 | debug
+    # sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended 2>&1 | debug
     mkdir -p $HOME/.cache/zsh
     touch $HOME/.cache/zsh/.histfile
-    git clone https://github.com/romkatv/powerlevel10k.git $HOME/.oh-my-zsh/custom/themes/powerlevel10k 2>&1 | debug
 }
 
 getDotfiles() {
@@ -340,14 +338,14 @@ getDotfiles() {
     cd $lastFolder
 
     sudo rm -f ~/.bashrc /usr/bin/CocoASAIS
-    calcWidthAndRun "whiptail --infobox \"Installing 'zaread-git'.\" 7 WIDTH"
-    set -o pipefail
-    paru -Q zaread-git 2>&1 | debug
-    if [ $? -eq 1 ]; then
-        paru -S --needed --noconfirm --skipreview zaread-git 2>&1 | debug
-    fi
-    set +o pipefail
-    chsh -s $(which zsh)
+    # calcWidthAndRun "whiptail --infobox \"Installing 'zaread-git'.\" 7 WIDTH"
+    # set -o pipefail
+    # paru -Q zaread-git 2>&1 | debug
+    # if [ $? -eq 1 ]; then
+    #     paru -S --needed --noconfirm --skipreview zaread-git 2>&1 | debug
+    # fi
+    # set +o pipefail
+    # chsh -s $(which zsh)
 }
 
 steps=(
@@ -363,7 +361,7 @@ steps=(
     updateMirrors
     grubSetUp
     userSetUp
-    installNotImportantPackages
+    installOtherPackages
     finishInstallation
 )
 
diff --git a/packages.csv b/packages.csv
index ba340d0..00c3c65 100644
--- a/packages.csv
+++ b/packages.csv
@@ -1,11 +1,11 @@
 NAME,IMPORTANT,INSTALLER
 base,Y,A
-base-devel,Y,A
+base-devel,S,B
 linux,Y,A
 linux-firmware,Y,A
 libxft-bgra,N,C
 alacritty,N,B
-alsa-utils,Y,B
+alsa-utils,S,B
 bc,N,B
 binwalk,N,B
 bitwarden,N,B
@@ -26,7 +26,7 @@ flameshot,N,B
 fzf,N,B
 gdb,N,B
 gimp,N,B
-git,Y,B
+git,S,B
 gnome-keyring,N,B
 gnu-netcat,N,B
 grub,Y,B
@@ -42,7 +42,7 @@ keepass-plugin-keeagent,N,B
 keychain,N,B
 libimobiledevice,N,B
 libreoffice-still,N,B
-linux-headers,Y,B
+linux-headers,S,B
 lxappearance,N,B
 man-pages,N,B
 mpv,N,B
@@ -67,9 +67,9 @@ pcmanfm,N,B
 pdfslicer,N,B
 perl-image-exiftool,N,B
 piper,N,B
-pipewire,Y,B
-pipewire-alsa,Y,B
-pipewire-pulse,Y,B
+pipewire,S,B
+pipewire-alsa,S,B
+pipewire-pulse,S,B
 psensor,N,B
 pulsemixer,N,B
 python-pip,N,B
@@ -105,8 +105,8 @@ virtualbox,N,B
 wget,N,B
 xclip,N,B
 xcompmgr,N,B
-xdg-user-dirs,Y,B
-xdg-utils,Y,B
+xdg-user-dirs,S,B
+xdg-utils,S,B
 xdotool,N,B
 xorg,N,B
 xorg-xinit,N,B
@@ -115,7 +115,6 @@ youtube-dl,N,B
 zathura,N,B
 zathura-pdf-mupdf,N,B
 zsh,Y,B
-zsh-theme-powerlevel10k,N,B
 ani-cli-git,N,C
 bashmount,N,C
 brave-bin,N,C
@@ -128,7 +127,6 @@ jetbrains-toolbox,N,C
 mutt-wizard-git,N,C
 noisetorch,N,C
 nvimpager-git,N,C
-oh-my-zsh-git,N,C
 orchis-theme-bin,N,C
 pam-gnupg,N,C
 pandoc-bin,N,C
@@ -138,7 +136,9 @@ rtl8821cu-dkms-git,N,C
 shellcheck-bin,N,C
 spotify,N,C
 tela-icon-theme-bin,N,C
-ttf-meslo-nerd-font-powerlevel10k,N,C
 v4l2loopback-dc-dkms,N,C
 visual-studio-code-bin,N,C
 zaread-git,N,C
+oh-my-zsh-git,N,C
+ttf-meslo-nerd-font-powerlevel10k,N,C
+zsh-theme-powerlevel10k,N,B