From a87823a4ec0e72f478f8078063cd2fb5010063bb Mon Sep 17 00:00:00 2001
From: Kurtis Andrews <kurtis@whonet.com.au>
Date: Fri, 20 Dec 2024 22:39:31 +1000
Subject: [PATCH] Changed package manager to nala for installers

---
 vargtools | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/vargtools b/vargtools
index 7011630..75183ad 100644
--- a/vargtools
+++ b/vargtools
@@ -184,7 +184,8 @@ doInit() {
         sudo sed -i "/^deb cdrom:/s/^/#/" /etc/apt/sources.list
         sudo apt update
         echo Installing base software
-        sudo apt install -y git python3 python3-pip pipx stow btop duf
+        sudo apt install -y nala
+        sudo nala install -y git python3 python3-pip pipx stow btop duf
         echo installing console python apps
         pipx ensurepath
         pipx install thefuck
@@ -219,6 +220,7 @@ setupDotFiles() {
     git clone "https://$tcmeta_key@git.tcmeta.net/kurtis/dotfiles.git" $user_home/.dotfiles
     echo "alias dotfiles-update='$user_home/.dotfiles/update-repo'" | tee -a $user_home/.bash_aliases > /dev/null
     echo "alias dotfiles-push='$user_home/.dotfiles/push-repo'" | tee -a $user_home/.bash_aliases > /dev/null
+    $user_home/.dotfiles/push-repo
     return 1
 }
 
@@ -226,9 +228,9 @@ installChicago95() {
     logo
     echo [Chicago95] Installing prereqs
     wget "https://github.com/MerkeX/Lightdm-webkit2-greeter/releases/download/v2.2.5-1/lightdm-webkit2-greeter_2.2.5-1_amd64.deb" -O /tmp/lightdm-webkit2-greeter.deb
-    sudo apt install -y /tmp/lightdm-webkit2-greeter.deb
+    sudo nala install -y /tmp/lightdm-webkit2-greeter.deb
     rm /tmp/lightdm-webkit2-greeter.deb
-    sudo apt install -y xfce4-panel-profiles gnome-session-canberra sox libcanberra-gtk3-module libcanberra-gtk-module dbus-x11 gvfs-backends mugshot
+    sudo nala install -y xfce4-panel-profiles gnome-session-canberra sox libcanberra-gtk3-module libcanberra-gtk-module dbus-x11 gvfs-backends mugshot
     echo [Chicago95] Downloading theme
     git clone https://github.com/grassmunk/Chicago95.git /tmp/Chicago95
     echo [Chicago95] Installing system wide
@@ -329,7 +331,7 @@ installDiscord() {
     echo [Discord] Downloading latest version
     wget "https://discord.com/api/download?platform=linux&format=deb" -O /tmp/discord.deb
     echo [Discord] Installing
-    sudo apt install -y /tmp/discord.deb
+    sudo nala install -y /tmp/discord.deb
     echo [Discord] Cleaning up
     rm /tmp/discord.deb
     return 1
@@ -354,8 +356,8 @@ installBrave() {
     sudo wget "https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg" -O /usr/share/keyrings/brave-browser-archive-keyring.gpg
     echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg] https://brave-browser-apt-release.s3.brave.com/ stable main"|sudo tee /etc/apt/sources.list.d/brave-browser-release.list
     echo [Brave] Installing Brave Browser
-    sudo apt update
-    sudo apt install -y brave-browser
+    sudo nala update
+    sudo nala install -y brave-browser
 }
 
 configBrave() {
@@ -377,28 +379,28 @@ installSublime() {
     rm /tmp/sublimehq-pub-download.gpg /tmp/temp-keyring.gpg /tmp/sublimehq-pub.gpg
     echo "deb [signed-by=/etc/apt/keyrings/sublimehq-pub.gpg] https://download.sublimetext.com/ apt/stable/" | sudo tee /etc/apt/sources.list.d/sublime-text.list
     echo [Sublime] Updating Repo
-    sudo apt update
+    sudo nala update
     echo [Sublime] Installing
-    sudo apt install sublime-text sublime-merge
+    sudo nala install sublime-text sublime-merge
     return 1
 }
 
 installChromium() {
     echo [Chromium] Installing Chromium
-    sudo apt install -y chromium
+    sudo nala install -y chromium
     return 1
 }
 
 installBluetooth() {
     if ! [ -x "$(command -v bluetooth)" ]; then
         echo [Bluetooth] Installing bluetooth stack
-        apt install -y bluetooth
+        sudo nala install -y bluetooth
     else
         echo [Bluetooth] Bluetooth already installed
     fi
     if ! [ -x "$(command -v blueman)" ]; then
         echo [Bluetooth] Installing blueman
-        apt install -y blueman
+        sudo nala install -y blueman
     else
         echo [Bluetooth] Blueman already installed
     fi
@@ -417,7 +419,7 @@ configChromium() {
 installFlatPak() {
     if ! [ -x "$(command -v flatpak)" ]; then
         echo [FlatPak] Installing
-        sudo apt install -y flatpak
+        sudo nala install -y flatpak
         flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
     else
         echo [FlatPak] Already Installed Installed