Merge branch 'Solus' into Void

ChrisTitusTech · Jan 10, 2025 · 3598976 · 3598976
2 parents 2c273f6 + 59b931a
commit 3598976
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 26 deletions.
diff --git a/core/tabs/applications-setup/Developer-tools/meld-setup.sh b/core/tabs/applications-setup/Developer-tools/meld-setup.sh
@@ -9,7 +9,7 @@ installMeld() {
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm meld
                 ;;
-            apt-get|nala)
+            apt-get|nala|eopkg)
                 "$ESCALATION_TOOL" "$PACKAGER" -y install meld
                 ;;
             apk)
@@ -30,4 +30,4 @@ installMeld() {
 
 checkEnv
 checkEscalationTool
-installMeld
+installMeld
diff --git a/core/tabs/applications-setup/Developer-tools/neovim-setup.sh b/core/tabs/applications-setup/Developer-tools/neovim-setup.sh
@@ -35,6 +35,9 @@ installNeovim() {
         xbps-install)
             "$ESCALATION_TOOL" "$PACKAGER" -y neovim ripgrep fzf python3-virtualenv luarocks go shellcheck git
             ;;
+        eopkg)
+            "$ESCALATION_TOOL" "$PACKAGER" -y install neovim ripgrep fzf python3 luarocks golang 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
@@ -31,6 +31,9 @@ installVsCode() {
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y vscode
                 ;;
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install vscode
+                ;;
             apk)
                 checkFlatpak
                 flatpak install -y flathub com.visualstudio.code

diff --git a/core/tabs/applications-setup/browsers/firefox.sh b/core/tabs/applications-setup/browsers/firefox.sh
@@ -15,8 +15,8 @@ installFirefox() {
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm firefox
                 ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y firefox
+            dnf|eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install firefox
                 ;;
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y firefox

diff --git a/core/tabs/applications-setup/browsers/tor-browser.sh b/core/tabs/applications-setup/browsers/tor-browser.sh
@@ -6,7 +6,7 @@ installTorBrowser() {
     if ! command_exists torbrowser-launcher; then
         printf "%b\n" "${YELLOW}Installing Tor Browser...${RC}"
         case "$PACKAGER" in
-            apt-get|nala)
+            apt-get|nala|dnf|eopkg)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y torbrowser-launcher
                 ;;
             zypper)
@@ -15,9 +15,6 @@ installTorBrowser() {
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm torbrowser-launcher
                 ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y torbrowser-launcher
-                ;;
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y torbrowser-launcher
                 ;;

diff --git a/core/tabs/applications-setup/browsers/vivaldi.sh b/core/tabs/applications-setup/browsers/vivaldi.sh
@@ -30,6 +30,9 @@ installVivaldi() {
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm vivaldi
                 ;;
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install vivaldi-stable
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                 exit 1

diff --git a/core/tabs/applications-setup/communication-apps/signal-setup.sh b/core/tabs/applications-setup/communication-apps/signal-setup.sh
@@ -21,7 +21,10 @@ installSignal() {
                 ;;
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y Signal-Desktop
-                ;;                
+                ;;    
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install 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
@@ -15,6 +15,9 @@ installTelegram() {
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y telegram-desktop
                 ;;
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install telegram
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y telegram-desktop 
                 ;;

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

diff --git a/core/tabs/applications-setup/office-suites/libreoffice.sh b/core/tabs/applications-setup/office-suites/libreoffice.sh
@@ -22,6 +22,9 @@ installLibreOffice() {
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y libreoffice
                 ;;
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install libreoffice
+                ;;
             *)
                 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
@@ -6,7 +6,7 @@ installPodman() {
     if ! command_exists podman; then
         printf "%b\n" "${YELLOW}Installing Podman...${RC}"
         case "$PACKAGER" in
-            apt-get|nala)
+            apt-get|nala|dnf|eopkg)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y podman
                 ;;
             zypper)
@@ -15,9 +15,6 @@ installPodman() {
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm --needed podman
                 ;;
-            dnf)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y podman
-                ;;
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y podman
                 ;;

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 xbps-install'
+    checkPackageManager 'nala apt-get dnf pacman zypper apk xbps-install eopkg'
     checkCurrentDirectoryWritable
     checkSuperUser
     checkDistro

diff --git a/core/tabs/common-service-script.sh b/core/tabs/common-service-script.sh
@@ -82,6 +82,10 @@ startAndEnableService() {
             enableService "$1"
             startService "$1"
             ;;
+        runit)
+            enableService "$1"
+            startService "$1"
+            ;;
     esac
 }
 

diff --git a/core/tabs/system-setup/compile-setup.sh b/core/tabs/system-setup/compile-setup.sh
@@ -47,6 +47,12 @@ installDepend() {
             "$ESCALATION_TOOL" "$PACKAGER" -Sy
             "$ESCALATION_TOOL" "$PACKAGER" -y glibc-32bit gcc-multilib
             ;;
+        eopkg)
+            SOLUS_DEPENDENCIES='tar tree unzip cmake make jq'
+            COMPILEDEPS='-c system.devel'
+            "$ESCALATION_TOOL" "$PACKAGER" update-repo
+            "$ESCALATION_TOOL" "$PACKAGER" install -y $SOLUS_DEPENDENCIES $COMPILEDEPS
+            ;;
         *)
             "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES
             ;;

diff --git a/core/tabs/system-setup/global-theme.sh b/core/tabs/system-setup/global-theme.sh
@@ -5,15 +5,12 @@
 install_theme_tools() {
     printf "%b\n" "${YELLOW}Installing theme tools (qt6ct and kvantum)...${RC}"
     case "$PACKAGER" in
-        apt-get|nala)
+        apt-get|nala|dnf|eopkg)
             "$ESCALATION_TOOL" "$PACKAGER" install -y qt6ct kvantum
             ;;
         zypper)
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install qt6ct kvantum
             ;;
-        dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" install -y qt6ct kvantum
-            ;;
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm qt6ct kvantum
             ;;
@@ -88,4 +85,4 @@ applyTheming
 install_theme_tools
 configure_qt6ct
 configure_kvantum
-successOutput
+successOutput
diff --git a/core/tabs/system-setup/system-cleanup.sh b/core/tabs/system-setup/system-cleanup.sh
@@ -30,6 +30,9 @@ cleanup_system() {
         xbps-install)
             "$ESCALATION_TOOL" xbps-remove -Oo
             ;;
+        eopkg)
+            "$ESCALATION_TOOL" "$PACKAGER" -y remove-orphans
+            ;;
         *)
             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
@@ -59,6 +59,9 @@ fastUpdate() {
         xbps-install)
             "$ESCALATION_TOOL" "$PACKAGER" -S
             ;;
+        eopkg)
+            "$ESCALATION_TOOL" "$PACKAGER" -y update-repo
+            ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
             exit 1
@@ -88,6 +91,9 @@ updateSystem() {
         xbps-install)
             "$ESCALATION_TOOL" "$PACKAGER" -Su
             ;;
+        eopkg)
+            "$ESCALATION_TOOL" "$PACKAGER" -y upgrade
+            ;;
         *)
             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
@@ -19,6 +19,9 @@ InstallTermiusFonts() {
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y terminus-font
                 ;;
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y font-terminus-console
+                ;;
             *)
                 printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                 exit 1
@@ -31,7 +34,7 @@ InstallTermiusFonts() {
 
 SetTermiusFonts() {
         case "$DTYPE" in
-            arch|fedora|void)
+            arch|fedora|void|solus)
                 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

diff --git a/core/tabs/utils/printers/install-cups.sh b/core/tabs/utils/printers/install-cups.sh
@@ -9,10 +9,7 @@ installCUPS() {
     pacman)
         "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm cups
         ;;
-    apt-get | nala)
-        "$ESCALATION_TOOL" "$PACKAGER" install -y cups
-        ;;
-    dnf)
+    apt-get|nala|dnf|eopkg)
         "$ESCALATION_TOOL" "$PACKAGER" install -y cups
         ;;
     xbps-install)

diff --git a/core/tabs/utils/printers/install-epson-printer-drivers.sh b/core/tabs/utils/printers/install-epson-printer-drivers.sh
@@ -10,10 +10,10 @@ installEpsonPrinterDriver() {
     pacman)
         "$AUR_HELPER" -S --noconfirm epson-inkjet-printer-escpr
         ;;
-    apt-get | nala)
+    apt-get|nala)
         "$ESCALATION_TOOL" "$PACKAGER" install -y printer-driver-escpr
         ;;
-    dnf)
+    dnf|eopkg)
         "$ESCALATION_TOOL" "$PACKAGER" install -y epson-inkjet-printer-escpr
         ;;
     xbps-install) 

diff --git a/core/tabs/utils/utility_functions.sh b/core/tabs/utils/utility_functions.sh
@@ -19,6 +19,9 @@ setup_xrandr() {
             xbps-install)
                 "$ESCALATION_TOOL" "$PACKAGER" -y xrandr
                 ;;
+            eopkg)
+                "$ESCALATION_TOOL" "$PACKAGER" install -y xrandr
+                ;;
             *)
                 "$ESCALATION_TOOL" "$PACKAGER" install -y xorg-x11-server-utils
                 ;;
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,9 @@ installVivaldi() { @@
                 pacman)
                     "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm vivaldi
                     ;;
+                eopkg)
+                    "$ESCALATION_TOOL" "$PACKAGER" -y install vivaldi-stable
+                    ;;
                 *)
                     printf "%b\n" "${RED}Unsupported package manager: ""$PACKAGER""${RC}"
                     exit 1
@@ Expand Down @@