From 3a9f968e18bb62710418fd83e4784cb02f105ae8 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Thu, 4 Apr 2024 04:09:31 +0330
Subject: [PATCH] fix: startup apps

---
 configs/hyprland/hypr/configs/autostart.conf  | 21 +++++++------------
 configs/hyprland/hypr/hyprland.conf           |  4 ++--
 .../{dunst-launch.sh => startup/dunst.sh}     |  0
 .../{keyring-launch.sh => startup/keyring.sh} |  0
 .../scripts/startup}/pipewire.sh              |  0
 .../{waybar-launch.sh => startup/waybar.sh}   |  0
 .../kill-daemon.sh}                           |  0
 .../{ => wallpaper}/mpvpaper-random.sh        |  0
 .../scripts/{ => wallpaper}/swaybg-random.sh  |  0
 .../scripts/{ => wallpaper}/swww-random.sh    |  0
 .../{ => wallpaper}/wallpaper-daemon.sh       |  6 +++---
 11 files changed, 12 insertions(+), 19 deletions(-)
 rename configs/hyprland/hypr/scripts/{dunst-launch.sh => startup/dunst.sh} (100%)
 rename configs/hyprland/hypr/scripts/{keyring-launch.sh => startup/keyring.sh} (100%)
 rename configs/hyprland/{scripts => hypr/scripts/startup}/pipewire.sh (100%)
 rename configs/hyprland/hypr/scripts/{waybar-launch.sh => startup/waybar.sh} (100%)
 rename configs/hyprland/hypr/scripts/{kill-wallpaper-daemon.sh => wallpaper/kill-daemon.sh} (100%)
 rename configs/hyprland/hypr/scripts/{ => wallpaper}/mpvpaper-random.sh (100%)
 rename configs/hyprland/hypr/scripts/{ => wallpaper}/swaybg-random.sh (100%)
 rename configs/hyprland/hypr/scripts/{ => wallpaper}/swww-random.sh (100%)
 rename configs/hyprland/hypr/scripts/{ => wallpaper}/wallpaper-daemon.sh (75%)

diff --git a/configs/hyprland/hypr/configs/autostart.conf b/configs/hyprland/hypr/configs/autostart.conf
index a999073..6a3bdd8 100644
--- a/configs/hyprland/hypr/configs/autostart.conf
+++ b/configs/hyprland/hypr/configs/autostart.conf
@@ -2,24 +2,17 @@
 # Autostart
 # -----------------------------------------------------
 
-# background services :
 exec-once = dbus-update-activation-environment --all &
-exec-once = ~/.config/scripts/pipewire.sh &
-exec-once = ~/.config/hypr/scripts/keyring-launch.sh &
+exec-once = ~/.config/hypr/scripts/startup/pipewire.sh &
+exec-once = ~/.config/hypr/scripts/startup/keyring.sh &
 exec-once = wl-paste --watch cliphist store &
 exec-once = swayosd-server &
 
+exec-once = ~/.config/hypr/scripts/startup/dunst.sh &
+exec-once = ~/.config/hypr/scripts/wallpaper/wallpaper-daemon.sh &
+exec-once = ~/.config/hypr/scripts/startup/waybar.sh &
+
 # exec-once = avizo-service &
-
-# wallpaper :
-exec-once = ~/.config/hypr/scripts/wallpaper-daemon.sh &
-
-# status bar :
-exec-once = ~/.config/hypr/scripts/waybar-launch.sh &
-exec-once = ~/.config/hypr/scripts/dunst-launch.sh &
 # exec-once = eww daemon && eww open bar
 # exec-once = swayidle -w timeout 300 'gtklock' before-sleep 'gtklock' &
-# exec-once = swayidle -w timeout 450 'pidof java || systemctl suspend' & # dont sleep if playing minecraft, else nvidia will fuck up
-
-# cursor :
-# exec-once = hyprctl setcursor Bibata-Modern-Ice
\ No newline at end of file
+# exec-once = swayidle -w timeout 450 'pidof java || systemctl suspend' & # dont sleep if playing minecraft, else nvidia will fuck up
\ No newline at end of file
diff --git a/configs/hyprland/hypr/hyprland.conf b/configs/hyprland/hypr/hyprland.conf
index da702f2..2e0d46d 100644
--- a/configs/hyprland/hypr/hyprland.conf
+++ b/configs/hyprland/hypr/hyprland.conf
@@ -31,8 +31,8 @@ $screenshot = $SCRIPT_PATH/hyprshot.sh
 $pavucontrol = $SCRIPT_PATH/pavucontrol-launch.sh
 $nekoray = $SCRIPT_PATH/nekoray-launch.sh
 $network_manager = $SCRIPT_PATH/nmtui-launch.sh
-$random_wallpaper = $SCRIPT_PATH/wallpaper-daemon.sh
-$kill_wallpaper_daemon = $SCRIPT_PATH/kill-wallpaper-daemon.sh
+$random_wallpaper = $SCRIPT_PATH/wallpaper/wallpaper-daemon.sh
+$kill_wallpaper_daemon = $SCRIPT_PATH/wallpaper/kill-daemon.sh
 $waybar_toggle = $SCRIPT_PATH/waybar-toggle.sh
 $rofi_menu = $SCRIPT_PATH/rofi-launch.sh d
 $rofi_powermenu = $SCRIPT_PATH/rofi-launch.sh p
diff --git a/configs/hyprland/hypr/scripts/dunst-launch.sh b/configs/hyprland/hypr/scripts/startup/dunst.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/dunst-launch.sh
rename to configs/hyprland/hypr/scripts/startup/dunst.sh
diff --git a/configs/hyprland/hypr/scripts/keyring-launch.sh b/configs/hyprland/hypr/scripts/startup/keyring.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/keyring-launch.sh
rename to configs/hyprland/hypr/scripts/startup/keyring.sh
diff --git a/configs/hyprland/scripts/pipewire.sh b/configs/hyprland/hypr/scripts/startup/pipewire.sh
similarity index 100%
rename from configs/hyprland/scripts/pipewire.sh
rename to configs/hyprland/hypr/scripts/startup/pipewire.sh
diff --git a/configs/hyprland/hypr/scripts/waybar-launch.sh b/configs/hyprland/hypr/scripts/startup/waybar.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/waybar-launch.sh
rename to configs/hyprland/hypr/scripts/startup/waybar.sh
diff --git a/configs/hyprland/hypr/scripts/kill-wallpaper-daemon.sh b/configs/hyprland/hypr/scripts/wallpaper/kill-daemon.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/kill-wallpaper-daemon.sh
rename to configs/hyprland/hypr/scripts/wallpaper/kill-daemon.sh
diff --git a/configs/hyprland/hypr/scripts/mpvpaper-random.sh b/configs/hyprland/hypr/scripts/wallpaper/mpvpaper-random.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/mpvpaper-random.sh
rename to configs/hyprland/hypr/scripts/wallpaper/mpvpaper-random.sh
diff --git a/configs/hyprland/hypr/scripts/swaybg-random.sh b/configs/hyprland/hypr/scripts/wallpaper/swaybg-random.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/swaybg-random.sh
rename to configs/hyprland/hypr/scripts/wallpaper/swaybg-random.sh
diff --git a/configs/hyprland/hypr/scripts/swww-random.sh b/configs/hyprland/hypr/scripts/wallpaper/swww-random.sh
similarity index 100%
rename from configs/hyprland/hypr/scripts/swww-random.sh
rename to configs/hyprland/hypr/scripts/wallpaper/swww-random.sh
diff --git a/configs/hyprland/hypr/scripts/wallpaper-daemon.sh b/configs/hyprland/hypr/scripts/wallpaper/wallpaper-daemon.sh
similarity index 75%
rename from configs/hyprland/hypr/scripts/wallpaper-daemon.sh
rename to configs/hyprland/hypr/scripts/wallpaper/wallpaper-daemon.sh
index 35dce5d..540f446 100755
--- a/configs/hyprland/hypr/scripts/wallpaper-daemon.sh
+++ b/configs/hyprland/hypr/scripts/wallpaper/wallpaper-daemon.sh
@@ -12,7 +12,7 @@ case $WALLPAPER_DAEMON in
     pkill -f swww-daemon
     pkill -f mpvpaper
 
-    exec $HOME/.config/hypr/scripts/swaybg-random.sh
+    exec ~/.config/hypr/scripts/wallpaper/swaybg-random.sh
     ;;
 "swww")
     pkill -f swaybg
@@ -22,13 +22,13 @@ case $WALLPAPER_DAEMON in
         swww init
     fi
 
-    exec $HOME/.config/hypr/scripts/swww-random.sh
+    exec ~/.config/hypr/scripts/wallpaper/swww-random.sh
     ;;
 "mpvpaper")
     pkill -f swaybg
     pkill -f swww-daemon
 
-    exec $HOME/.config/hypr/scripts/mpvpaper-random.sh
+    exec ~/.config/hypr/scripts/wallpaper/mpvpaper-random.sh
     ;;
 *)
     dunstify "Unknown value for WALLPAPER_DAEMON: $WALLPAPER_DAEMON"