Merge pull request #542 from JaKooLit/development

Development to Main

6 files changed, 9 insertions, 47 deletions

diff --git a/config/hypr/UserScripts/Animations.sh b/config/hypr/UserScripts/Animations.sh
deleted file mode 100755
index 71368bbe..00000000
--- a/config/hypr/UserScripts/Animations.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# For applying Animations from different users
-
-# Check if rofi is already running
-if pidof rofi > /dev/null; then
-  pkill rofi
-fi
-
-# Variables
-iDIR="$HOME/.config/swaync/images"
-SCRIPTSDIR="$HOME/.config/hypr/scripts"
-animations_dir="$HOME/.config/hypr/animations"
-UserConfigs="$HOME/.config/hypr/UserConfigs"
-
-# list of animation files
-animations_list=$(find "$animations_dir" -maxdepth 1 -type f | sed 's/.*\///' | sed 's/\.conf$//')
-
-# Rofi Menu
-chosen_file=$(echo "$animations_list" | rofi -i -dmenu -config ~/.config/rofi/config-Animations.rasi "Choose animation:")
-
-# Check if a file was selected
-if [[ -n "$chosen_file" ]]; then
-    # Find the full path of the chosen file
-    full_path="$animations_dir/$chosen_file.conf"
-    
-    cp "$full_path" "$UserConfigs/UserAnimations.conf"
-    
-    notify-send -u low -i "$iDIR/ja.png" "$chosen_file" "Animation Loaded"
-else
-    notify-send -u low -i "$iDIR/ja.png" "You chose to" "NOT apply other animations"
-fi
-
-sleep 1
-"$SCRIPTSDIR/RefreshNoWaybar.sh"
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index e5c26e20..e0af9dce 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -23,8 +23,7 @@ menu() {
 8. View / Edit  Decorations
 9. View / Edit  Animations
 10. View / Edit  Workspace-Rules
-11. View / Edit  Default-Settings
-12. View / Edit  Default-Keybinds
+11. View / Edit  Default-Keybinds
 EOF
 }
 
@@ -44,8 +43,7 @@ main() {
         8) file="$UserConfigs/UserDecorations.conf" ;;
         9) file="$UserConfigs/UserAnimations.conf" ;;
         10) file="$UserConfigs/WorkspaceRules.conf" ;;
-        11) file="$configs/Settings.conf" ;;
-        12) file="$configs/Keybinds.conf" ;;
+        11) file="$configs/Keybinds.conf" ;;
         *) return ;;  # Do nothing for invalid choices
     esac
 
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 919eafc3..bb20e2b6 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -47,7 +47,7 @@ play_local_music() {
   populate_local_music
 
   # Prompt the user to select a song
-  choice=$(printf "%s\n" "${filenames[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -p "Local Music")
+  choice=$(printf "%s\n" "${filenames[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi)
 
   if [ -z "$choice" ]; then
     exit 1
@@ -77,7 +77,7 @@ shuffle_local_music() {
 
 # Main function for playing online music
 play_online_music() {
-  choice=$(printf "%s\n" "${!online_music[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -p "Online Music")
+  choice=$(printf "%s\n" "${!online_music[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi)
 
   if [ -z "$choice" ]; then
     exit 1
@@ -101,7 +101,7 @@ fi
 
 
 # Prompt the user to choose between local and online music
-user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi -p "Select music source")
+user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi)
 
   case "$user_choice" in
     "Play from Music Folder")
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 481489e9..ccb5b744 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -63,7 +63,7 @@ main() {
     done
 
     # Show rofi menu and handle user choice
-    choice=$(printf "%s\n" "${options[@]}" | LC_COLLATE=C sort | rofi -dmenu -p "Choose effect" -i -config ~/.config/rofi/config-wallpaper-effect.rasi)
+    choice=$(printf "%s\n" "${options[@]}" | LC_COLLATE=C sort | rofi -dmenu -i -config ~/.config/rofi/config-wallpaper-effect.rasi)
 
     # Process user choice
     if [[ -n "$choice" ]]; then
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index 3c8c7520..1a5064e7 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -7,7 +7,7 @@ SCRIPTSDIR="$HOME/.config/hypr/scripts"
 
 focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}')
 
-PICS=($(find ${wallDIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \)))
+PICS=($(find ${wallDIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.pnm" -o -name "*.tga" -o -name "*.tiff" -o -name "*.webp" -o -name "*.bmp" -o -name "*.farbfeld" -o -name "*.gif" \)))
 RANDOMPICS=${PICS[ $RANDOM % ${#PICS[@]} ]}
 
 
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 6aa60804..7d6b339f 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -21,7 +21,7 @@ if pidof swaybg > /dev/null; then
 fi
 
 # Retrieve image files using null delimiter to handle spaces in filenames
-mapfile -d '' PICS < <(find "${wallDIR}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.gif" \) -print0)
+mapfile -d '' PICS < <(find "${wallDIR}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.pnm" -o -iname "*.tga" -o -iname "*.tiff" -o -iname "*.webp" -o -iname "*.bmp" -o -iname "*.farbfeld" -o -iname "*.png" -o -iname "*.gif" \) -print0)
 
 RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME=". random"
@@ -106,5 +106,4 @@ wait $!
 
 wait $!
 sleep 2
-"$SCRIPTSDIR/Refresh.sh"
-
+"$SCRIPTSDIR/Refresh.sh"
\ No newline at end of file