From 8078d8d5d15d69f20d33ddbc244a3287e0accd01 Mon Sep 17 00:00:00 2001
From: pika <pika@team-pieck.de>
Date: Sat, 24 May 2025 14:36:27 +0200
Subject: [PATCH] fixed errors

---
 hyprland.sh | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/hyprland.sh b/hyprland.sh
index 8e8c899..ba7b4c7 100644
--- a/hyprland.sh
+++ b/hyprland.sh
@@ -22,7 +22,7 @@ command_exists() {
 # This only wokrs for generic package names, like neovim, or vim, or tmux etc..
 # not every package packagemanager has the same packagenames for their packages..
 source-script() {
-  i="https://git.k4li.de/scripts/imports/raw/branch/main/dream.sh"
+  i="$1"
   import="$(mktemp)"
   if command_exists curl; then
     curl -fsSL $i -o $import
@@ -41,8 +41,12 @@ askThings() {
   case "$distro" in
   arch)
     choose bar "Choose a bar.." waybar hyprpanel gBar </dev/tty
+    [ "$bar" == "gBar" ] && bar=gbar
+    ;;
+  *)
+    choose bar "Choose a bar.." waybar gBar </dev/tty
+    [ "$bar" == "gBar" ] && bar=gbar
     ;;
-  *) choose bar "Choose a bar.." waybar gBar </dev/tty ;;
   esac
 
   pen grey "$bar was picked"
@@ -50,17 +54,17 @@ askThings() {
   # if ! command_exists rofi && ! command_exists tofi; then
   choose menu "Choose a menu.." rofi tofi </dev/tty
   pen grey "$menu was picked"
-  line
 
   choose terminal "Choose a menu.." alacritty foot kitty wezterm </dev/tty
   pen grey "$terminal was picked"
-  line
 
   removeUnwanted=false
   if confirm --default-no "Do you want to also remove conflicting packages?" </dev/tty; then
     removeUnwanted=true
   fi
 
+  line
+
   advDeps=(
     "${menu:-rofi}"
     "${terminal:-foot}"
@@ -78,21 +82,6 @@ instCustom() {
       # 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/$_d.sh
       ;;
-    # hyprlock)
-    #   source-script https://git.k4li.de/scripts/installs/raw/branch/main/hyprlock.sh
-    #   ;;
-    # hyprshot)
-    #   source-script https://git.k4li.de/scripts/installs/raw/branch/main/hyprshot.sh
-    #   ;;
-    # gBar)
-    #   source-script https://git.k4li.de/scripts/installs/raw/branch/main/gBar.sh
-    #   ;;
-    # rofi)
-    #   source-script https://git.k4li.de/scripts/installs/raw/branch/main/rofi.sh
-    #   ;;
-    # swww)
-    #   source-script https://git.k4li.de/scripts/installs/raw/branch/main/swww.sh
-    #   ;;
     none)
       return
       ;;
@@ -302,8 +291,6 @@ main() {
   if [[ ! -d "$HOME/dotfiles" ]]; then
     cloneDotfiles
   fi
-  # clone
-  # checkConfig
 }
 
 if setup-env; then
@@ -317,8 +304,8 @@ if setup-env; then
 
   PACKAGE=hyprland
   if command_exists "$PACKAGE"; then
-    echo_warning "$PACKAGE is already installed!"
-    echo_warning "Exiting now!"
+    pen bold yellow "$PACKAGE is already installed!"
+    pen bold yellow "Exiting now!"
     exit 69
   fi