From a3fe94d7dcf7dc5b579f1013b4b717fe592a6e73 Mon Sep 17 00:00:00 2001
From: pika <pika@team-pieck.de>
Date: Mon, 19 May 2025 18:48:43 +0200
Subject: [PATCH] testing source_script function

---
 hyprland.sh | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/hyprland.sh b/hyprland.sh
index bd209fa..10bd882 100644
--- a/hyprland.sh
+++ b/hyprland.sh
@@ -78,9 +78,7 @@ askThings() {
       bar="waybar"
       ;;
     [Hh] | hyprpanel)
-      if ! $debian; then
-        bar="hyprpanel"
-      else
+      if $debian; then
         echo_warning "hyprpanel is not available for $distro"
         echo_warning "the script automatically chose gBar for you instead.."
         bar="gBar"
@@ -145,22 +143,23 @@ instCustom() {
   for _d in "${advDeps[@]}"; do
     case "$_d" in
     hyprpanel)
-      eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/hyprpanel.sh)"
+      # eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/hyprpanel.sh)"
+      source_script https://git.k4li.de/scripts/installs/raw/branch/main/hyprpanel.sh
       ;;
     hyprlock)
-      eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/hyprlock.sh)"
+      source_script https://git.k4li.de/scripts/installs/raw/branch/main/hyprlock.sh
       ;;
     hyprshot)
-      eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/hyprshot.sh)"
+      source_script https://git.k4li.de/scripts/installs/raw/branch/main/hyprshot.sh
       ;;
     gBar)
-      eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/gbar.sh)"
+      source_script https://git.k4li.de/scripts/installs/raw/branch/main/gBar.sh
       ;;
     rofi)
-      eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/rofi.sh)"
+      source_script https://git.k4li.de/scripts/installs/raw/branch/main/rofi.sh
       ;;
     swww)
-      eval "$(curl -fsSL https://git.k4li.de/scripts/installs/raw/branch/main/swww.sh)"
+      source_script https://git.k4li.de/scripts/installs/raw/branch/main/swww.sh
       ;;
     *)
       checkAndInstall "$_d"
@@ -224,25 +223,30 @@ getDependencies() {
   # │ You can define dependencies for various linux distros here. It will     │
   # │ automagically be pulled via the $pkgArray[$distro] variable             │
   # ╰─────────────────────────────────────────────────────────────────────────╯
-  depsDebian=(
+  generalDeps=(
     hyprland
-    hyprland-dev
+    xdg-desktop-portal-hyprland
     hyprland-protocols
     wayland-protocols
-    xdg-desktop-portal-hyprland
+
+    grim
+    slurp
+    wlogout
+    ffmpeg
+    wob
+    nwg-look
     kitty
+    wl-clipboard
+  )
+  depsDebian=(
+    hyprland-dev
   )
   depsFedora=()
   depsOpensuse=()
   depsArch=(
-    hyprland
-    hypridle
     hyprpolkitagent
-    hyprland-protocols
     wayland-utils
     wayland-protocols
-    wl-clipboard
-    xdg-desktop-portal-hyprland
   )
   depsAlpine=()
 
@@ -286,12 +290,12 @@ getDependencies() {
 }
 
 main() {
+  askThings
   if $silent; then
     echo_warning "Executing script silently!"
   fi
   checkEnv
 
-  askThings
   getDependencies
   instCustom
   checkConfig