add Void linux support

ChrisTitusTech · Dec 24, 2024 · 0e4759f · 0e4759f
1 parent 987f5da
commit 0e4759f
Show file tree

Hide file tree

Showing 40 changed files with 225 additions and 42 deletions.
diff --git a/core/tabs/applications-setup/Developer-tools/meld-setup.sh b/core/tabs/applications-setup/Developer-tools/meld-setup.sh
@@ -15,6 +15,9 @@ installMeld() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add meld
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y meld
+                ;;
             *)
                 checkFlatpak
                 flatpak install -y flathub org.gnome.meld

diff --git a/core/tabs/applications-setup/Developer-tools/neovim-setup.sh b/core/tabs/applications-setup/Developer-tools/neovim-setup.sh
@@ -32,6 +32,9 @@ installNeovim() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" add neovim ripgrep fzf py3-virtualenv luarocks go shellcheck git
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -y neovim ripgrep fzf python3-virtualenv luarocks go shellcheck git
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
             exit 1

diff --git a/core/tabs/applications-setup/Developer-tools/vscode-setup.sh b/core/tabs/applications-setup/Developer-tools/vscode-setup.sh
@@ -28,6 +28,9 @@ installVsCode() {
                 printf "%b\n" '[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc' | "$ESCALATION_TOOL" tee /etc/yum.repos.d/vscode.repo > /dev/null
                 "$ESCALATION_TOOL" "$PACKAGER" install -y code
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y vscode
+                ;;
             apk)
                 checkFlatpak
                 flatpak install -y flathub com.visualstudio.code

diff --git a/core/tabs/applications-setup/alacritty-setup.sh b/core/tabs/applications-setup/alacritty-setup.sh
@@ -12,6 +12,9 @@ installAlacritty() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add alacritty
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y alacritty
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y alacritty
                 ;;

diff --git a/core/tabs/applications-setup/android-debloat.sh b/core/tabs/applications-setup/android-debloat.sh
@@ -18,6 +18,9 @@ install_adb() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add android-tools
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y android-tools
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
                 exit 1

diff --git a/core/tabs/applications-setup/browsers/chromium.sh b/core/tabs/applications-setup/browsers/chromium.sh
@@ -12,6 +12,9 @@ if ! command_exists chromium; then
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" add chromium
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -y chromium
+            ;;
         *)
             "$ESCALATION_TOOL" "$PACKAGER" install -y chromium
             ;;

diff --git a/core/tabs/applications-setup/browsers/firefox.sh b/core/tabs/applications-setup/browsers/firefox.sh
@@ -18,6 +18,9 @@ installFirefox() {
             dnf)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y firefox
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y firefox
+                ;;
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add firefox
                 ;;

diff --git a/core/tabs/applications-setup/browsers/librewolf.sh b/core/tabs/applications-setup/browsers/librewolf.sh
@@ -32,6 +32,10 @@ Signed-By: /usr/share/keyrings/librewolf.gpg" | "$ESCALATION_TOOL" tee /etc/apt/
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm librewolf-bin
                 ;;
+            xbps-install)
+                printf '%s\n' 'repository=https://github.com/index-0/librewolf-void/releases/latest/download/' | "$ESCALATION_TOOL" tee /etc/xbps.d/20-librewolf.conf > /dev/null
+                "$ESCALATION_TOOL" "$PACKAGER" -Syu librewolf
+                ;;
             apk)
                 checkFlatpak
                 flatpak install flathub io.gitlab.librewolf-community

diff --git a/core/tabs/applications-setup/browsers/lynx.sh b/core/tabs/applications-setup/browsers/lynx.sh
@@ -12,6 +12,9 @@ installLynx() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add lynx
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y lynx
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y lynx
                 ;;

diff --git a/core/tabs/applications-setup/browsers/tor-browser.sh b/core/tabs/applications-setup/browsers/tor-browser.sh
@@ -18,6 +18,9 @@ installTorBrowser() {
             dnf)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y torbrowser-launcher
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y torbrowser-launcher
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
                 exit 1

diff --git a/core/tabs/applications-setup/communication-apps/discord-setup.sh b/core/tabs/applications-setup/communication-apps/discord-setup.sh
@@ -20,6 +20,9 @@ installDiscord() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
                 "$ESCALATION_TOOL" "$PACKAGER" install -y discord
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y Signal-Desktop
+                ;;
             apk)
                 checkFlatpak
                 flatpak install -y flathub com.discordapp.Discord

diff --git a/core/tabs/applications-setup/communication-apps/signal-setup.sh b/core/tabs/applications-setup/communication-apps/signal-setup.sh
@@ -19,6 +19,9 @@ installSignal() {
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm signal-desktop
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y Signal-Desktop
+                ;;                
             dnf)
                 checkFlatpak
                 flatpak install -y flathub org.signal.Signal

diff --git a/core/tabs/applications-setup/communication-apps/telegram-setup.sh b/core/tabs/applications-setup/communication-apps/telegram-setup.sh
@@ -12,6 +12,9 @@ installTelegram() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add telegram-desktop
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y telegram-desktop
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop 
                 ;;

diff --git a/core/tabs/applications-setup/communication-apps/thunderbird-setup.sh b/core/tabs/applications-setup/communication-apps/thunderbird-setup.sh
@@ -12,6 +12,9 @@ installThunderBird() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add thunderbird
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y thunderbird
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y thunderbird 
                 ;;

diff --git a/core/tabs/applications-setup/docker-setup.sh b/core/tabs/applications-setup/docker-setup.sh
@@ -46,6 +46,9 @@ install_docker() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" add docker
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -y docker
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
             exit 1
@@ -80,6 +83,9 @@ install_docker_compose() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" add docker-cli-compose
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -y docker-compose
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
             exit 1

diff --git a/core/tabs/applications-setup/fastfetch-setup.sh b/core/tabs/applications-setup/fastfetch-setup.sh
@@ -17,6 +17,9 @@ installFastfetch() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add fastfetch
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y fastfetch
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y fastfetch
                 ;;

diff --git a/core/tabs/applications-setup/kitty-setup.sh b/core/tabs/applications-setup/kitty-setup.sh
@@ -12,6 +12,9 @@ installKitty() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add kitty
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y kitty
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y kitty
                 ;;

diff --git a/core/tabs/applications-setup/mybash-setup.sh b/core/tabs/applications-setup/mybash-setup.sh
@@ -14,6 +14,9 @@ installDepend() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add bash bash-completion tar bat tree unzip fontconfig git
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y bash bash-completion tar bat tree unzip fontconfig git
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
                 ;;

diff --git a/core/tabs/applications-setup/office-suites/libreoffice.sh b/core/tabs/applications-setup/office-suites/libreoffice.sh
@@ -19,6 +19,9 @@ installLibreOffice() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add libreoffice
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y libreoffice
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                 exit 1

diff --git a/core/tabs/applications-setup/pdf-suites/evince.sh b/core/tabs/applications-setup/pdf-suites/evince.sh
@@ -12,6 +12,9 @@ installEvince() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add evince
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y evince
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y evince
                 ;;

diff --git a/core/tabs/applications-setup/pdf-suites/okular.sh b/core/tabs/applications-setup/pdf-suites/okular.sh
@@ -12,6 +12,9 @@ installOkular() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add okular
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y okular
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y okular
                 ;;

diff --git a/core/tabs/applications-setup/podman-compose-setup.sh b/core/tabs/applications-setup/podman-compose-setup.sh
@@ -18,6 +18,9 @@ installPodmanCompose() {
             dnf)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y podman-compose
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y podman-compose
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
                 exit 1

diff --git a/core/tabs/applications-setup/podman-setup.sh b/core/tabs/applications-setup/podman-setup.sh
@@ -18,6 +18,9 @@ installPodman() {
             dnf)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y podman
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y podman
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
                 exit 1

diff --git a/core/tabs/applications-setup/rofi-setup.sh b/core/tabs/applications-setup/rofi-setup.sh
@@ -12,6 +12,9 @@ installRofi() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add rofi
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y rofi  
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y rofi
                 ;;

diff --git a/core/tabs/applications-setup/zsh-setup.sh b/core/tabs/applications-setup/zsh-setup.sh
@@ -13,6 +13,9 @@ installZsh() {
           apk)
               "$ESCALATION_TOOL" "$PACKAGER" add zsh
               ;;
+          xbps-install)
+              "$ESCALATION_TOOL" "$PACKAGER" -y zsh
+              ;;
           *)
               "$ESCALATION_TOOL" "$PACKAGER" install -y zsh
               ;;

diff --git a/core/tabs/common-script.sh b/core/tabs/common-script.sh
@@ -182,7 +182,7 @@ checkEnv() {
     checkArch
     checkEscalationTool
     checkCommandRequirements "curl groups $ESCALATION_TOOL"
-    checkPackageManager 'nala apt-get dnf pacman zypper apk'
+    checkPackageManager 'nala apt-get dnf pacman zypper apk xbps-install'
     checkCurrentDirectoryWritable
     checkSuperUser
     checkDistro

diff --git a/core/tabs/security/firewall-baselines.sh b/core/tabs/security/firewall-baselines.sh
@@ -12,6 +12,9 @@ installPkg() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add ufw
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y ufw
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y ufw
                 ;;

diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh
@@ -40,6 +40,13 @@ installDepend() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" add build-base multitail tar tree trash-cli unzip cmake jq
             ;;
+        xbps-install)
+            COMPILEDEPS='base-devel'
+            "$ESCALATION_TOOL" "$PACKAGER" -y $DEPENDENCIES $COMPILEDEPS
+            "$ESCALATION_TOOL" "$PACKAGER" -y void-repo-multilib
+            "$ESCALATION_TOOL" "$PACKAGER" -Sy
+            "$ESCALATION_TOOL" "$PACKAGER" -y glibc-32bit gcc-multilib
+            ;;
         *)
             "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
             ;;

diff --git a/core/tabs/system-setup/global-theme.sh b/core/tabs/system-setup/global-theme.sh
@@ -17,6 +17,9 @@ install_theme_tools() {
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm qt6ct kvantum
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -y qt6ct kvantum
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
             exit 1

diff --git a/core/tabs/system-setup/system-cleanup.sh b/core/tabs/system-setup/system-cleanup.sh
@@ -27,6 +27,9 @@ cleanup_system() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" cache clean
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" xbps-remove -Oo
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}. Skipping.${RC}"
             ;;

diff --git a/core/tabs/system-setup/system-update.sh b/core/tabs/system-setup/system-update.sh
@@ -56,6 +56,9 @@ fastUpdate() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" update
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" xbps-install -S
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
             exit 1
@@ -82,6 +85,9 @@ updateSystem() {
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" upgrade
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -Su
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
             exit 1

diff --git a/core/tabs/system-setup/terminus-tty.sh b/core/tabs/system-setup/terminus-tty.sh
@@ -15,6 +15,9 @@ InstallTermiusFonts() {
                 ;;
             dnf)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y terminus-fonts-console
+                ;;            
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" -y terminus-font
                 ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
@@ -28,7 +31,7 @@ InstallTermiusFonts() {
 
 SetTermiusFonts() {
         case "$DTYPE" in
-            arch)
+            arch|fedora|void)
                 printf "%b\n" "${YELLOW}Updating FONT= line in /etc/vconsole.conf...${RC}"
                 "$ESCALATION_TOOL" sed -i 's/^FONT=.*/FONT=ter-v32b/' /etc/vconsole.conf
                 if [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then
@@ -50,14 +53,6 @@ SetTermiusFonts() {
                 fi
                 printf "%b\n" "${GREEN}Terminus font has been set for TTY.${RC}"
                 ;;
-            fedora)
-                printf "%b\n" "${YELLOW}Updating FONT= line in /etc/vconsole.conf...${RC}"
-                "$ESCALATION_TOOL" sed -i 's/^FONT=.*/FONT=ter-v32b/' /etc/vconsole.conf
-                if [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ]; then 
-                  "$ESCALATION_TOOL" setfont -C /dev/tty1 ter-v32b
-                fi               
-                printf "%b\n" "${GREEN}Terminus font has been set for TTY.${RC}"
-                ;;
         esac
 }
 

diff --git a/core/tabs/utils/bluetooth-control.sh b/core/tabs/utils/bluetooth-control.sh
@@ -14,6 +14,9 @@ setupBluetooth() {
             apk)
                 "$ESCALATION_TOOL" "$PACKAGER" add bluez
                 ;;
+            xbps-install)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y bluez
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y bluez
                 ;;

diff --git a/core/tabs/utils/encrypt_decrypt_tool.sh b/core/tabs/utils/encrypt_decrypt_tool.sh
@@ -22,6 +22,9 @@ if ! command_exists openssl; then
         apk)
             "$ESCALATION_TOOL" "$PACKAGER" add openssl
             ;;
+        xbps-install)
+            "$ESCALATION_TOOL" "$PACKAGER" -y openssl
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
             exit 1

diff --git a/core/tabs/utils/printers/install-cups.sh b/core/tabs/utils/printers/install-cups.sh
@@ -15,6 +15,9 @@ installCUPS() {
     dnf)
         "$ESCALATION_TOOL" "$PACKAGER" install -y cups
         ;;
+    xbps-install)
+        "$ESCALATION_TOOL" "$PACKAGER" -y cups
+        ;;
     *)
         printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}"
         exit 1