diff --git a/install.sh b/install.sh index 8f2b333..35eb20c 100644 --- a/install.sh +++ b/install.sh @@ -8,6 +8,7 @@ echo "[blacklayer] installing..." # ------------------------- install_jq() { if command -v jq >/dev/null 2>&1 \ + && command -v hypridle >/dev/null 2>&1 \ && ldconfig -p 2>/dev/null | grep -q libgtk-3 \ && ldconfig -p 2>/dev/null | grep -q gdk_pixbuf \ && ldconfig -p 2>/dev/null | grep -q gtk-layer-shell; then @@ -19,7 +20,7 @@ install_jq() { if command -v pacman >/dev/null 2>&1; then - sudo pacman -Sy --noconfirm gtk3 gdk-pixbuf2 gtk-layer-shell jq + sudo pacman -Sy --noconfirm gtk3 gdk-pixbuf2 gtk-layer-shell jq hypridle elif command -v apt >/dev/null 2>&1; then sudo apt update @@ -29,18 +30,33 @@ install_jq() { libgtk-layer-shell0 \ jq + echo "[blacklayer] unsupported package – please install hypridle manually" + elif command -v dnf >/dev/null 2>&1; then sudo dnf install -y \ gtk3 \ gdk-pixbuf2 \ gtk-layer-shell \ - jq + jq \ + hypridle else - echo "[blacklayer] unsupported distro – please install jq manually" - exit 1 + echo "[blacklayer] Unsupported distro." + echo "Please install required packages manually." + + read -rp "Did you install all required packages? (y/n): " answer + + case "$answer" in + y|Y|yes|YES) + echo "[blacklayer] Continuing..." + ;; + *) + echo "[blacklayer] Please install the packages and run this script again." + exit 1 + ;; + esac fi } @@ -61,7 +77,8 @@ mkdir -p "$BASE_DIR" # ------------------------- echo "[blacklayer] copying files to $BASE_DIR" cp blacklayer event-driven.sh blacklayer.conf blacklayer-worker.sh call-blacklayer.sh start-waybars.sh generate-waybar-configs.sh idle-lock.sh idle-sleep.sh idle-resume.sh "$BASE_DIR/" 2>/dev/null - +cp "/pending-relocation/hypridle.conf" "~/.config/hypr/" 2>/dev/null +cp "/pending-relocation/hypridle.service" "~/.config/systemd/user/" 2>/dev/null # ------------------------- @@ -74,6 +91,9 @@ chmod 700 "$BASE_DIR" chmod +x "$BASE_DIR"/*.sh 2>/dev/null || true chmod 600 "$BASE_DIR"/*.conf 2>/dev/null || true [ -f "$BASE_DIR/blacklayer" ] && chmod +x "$BASE_DIR/blacklayer" +systemctl --user daemon-reload +systemctl --user enable hypridle.service + echo "What is yours status bar?"