Merge pull request #542 from JaKooLit/development

Development to Main

13 files changed, 56 insertions, 50 deletions

diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 660ebe76..50d342ac 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -123,9 +123,11 @@ windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:negative
 windowrulev2 = float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)
 windowrulev2 = float, class:^([Ss]team)$, title:negative:^([Ss]team)$
 windowrulev2 = float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)
-windowrulev2 = float, class:(electron), title:(Add Folder to Workspace)
-windowrulev2 = float, class:^([Dd]iscord)$, title:(Open Files)
-windowrulev2 = size 70% 70%, class:^([Dd]iscord)$, title:(Open Files)
+#windowrulev2 = float, class:(electron), title:(Add Folder to Workspace)
+windowrulev2 = float, initialTitle:(Add Folder to Workspace)
+windowrulev2 = size 70% 60%, initialTitle:(Add Folder to Workspace)
+windowrulev2 = float, initialTitle:(Open Files)
+windowrulev2 = size 70% 60%, initialTitle:(Open Files)
 
 # OPACITY
 windowrulev2 = opacity 0.9 0.7, tag:browser*
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
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index feb21707..2ea3bfa3 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -38,7 +38,7 @@ bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Eff
 bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
 bind = $mainMod ALT, O, exec, hyprctl setprop active opaque toggle # disable opacity on active window
 bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # search keybinds via rofi
-bind = $mainMod SHIFT, A, exec, $UserScripts/Animations.sh #hyprland animations menu
+bind = $mainMod SHIFT, A, exec, $scriptsDir/Animations.sh #hyprland animations menu
 
 # Waybar / Bar related
 bind = $mainMod, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar 
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
deleted file mode 100644
index e96d85e3..00000000
--- a/config/hypr/configs/Settings.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-
-# Default Settings. avoid changing this file as during update, this will be replaced
-
-# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
-
-# Initial boot script enable to apply initial wallpapers, theming, new settings etc.
-exec-once = $HOME/.config/hypr/initial-boot.sh
\ No newline at end of file
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 7f9ebab9..fc2b781c 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -1,23 +1,38 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# always refer to Hyprland wiki
+# https://wiki.hyprland.org/
+
+# Initial boot script enable to apply initial wallpapers, theming, new settings etc.
+# suggest not to change this or delete this including deleting referrence file in ~/.config/hypr/.initial_startup_done
+# as long as the referrence file is present, this initial-boot.sh will not execute
+exec-once = $HOME/.config/hypr/initial-boot.sh
+
 # Sourcing external config files
+$configs = $HOME/.config/hypr/configs # Default Configs directory path
+
+source=$configs/Keybinds.conf # Pre-configured keybinds
+
+# ## This is where you want to start tinkering 
+$UserConfigs = $HOME/.config/hypr/UserConfigs # User Configs directory path
+
+source= $UserConfigs/Startup_Apps.conf # put your start-up packages on this file
+
+source= $UserConfigs/ENVariables.conf # Environment variables to load
+
+source= $UserConfigs/Monitors.conf # Its all about your monitor config
+
+source= $UserConfigs/Laptops.conf # For laptop related
+
+source= $UserConfigs/LaptopDisplay.conf # Laptop display related. You need to read the comment on this file
+
+source= $UserConfigs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules
+
+source= $UserConfigs/UserDecorations.conf # Decorations config file
 
-# Default Configs
-$configs = $HOME/.config/hypr/configs
+source= $UserConfigs/UserAnimations.conf # Animation config file
 
-source=$configs/Settings.conf
-source=$configs/Keybinds.conf
+source= $UserConfigs/UserKeybinds.conf # Put your own keybinds here
 
-# User Configs
-$UserConfigs = $HOME/.config/hypr/UserConfigs
+source= $UserConfigs/UserSettings.conf # Main Hyprland Settings.
 
-source= $UserConfigs/Startup_Apps.conf
-source= $UserConfigs/ENVariables.conf
-source= $UserConfigs/Monitors.conf
-source= $UserConfigs/Laptops.conf
-source= $UserConfigs/LaptopDisplay.conf
-source= $UserConfigs/WindowRules.conf
-source= $UserConfigs/UserDecorations.conf
-source= $UserConfigs/UserAnimations.conf
-source= $UserConfigs/UserKeybinds.conf
-source= $UserConfigs/UserSettings.conf
-source= $UserConfigs/WorkspaceRules.conf
+source= $UserConfigs/WorkspaceRules.conf # Hyprland workspaces
\ No newline at end of file
diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index 44dd1af1..7d2566a7 100755
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -14,8 +14,8 @@ background {
     monitor =
     # NOTE: use only 1 path
 	#path = screenshot   # screenshot of your desktop
-	path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified   # NOTE only png supported for now
-    #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
+	#path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects
+    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
     
     #color = $color7
 
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index e834d52c..975b5d62 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -14,8 +14,8 @@ background {
     monitor =
     # NOTE: use only 1 path
 	#path = screenshot   # screenshot of your desktop
-	path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified   # NOTE only png supported for now
-    #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
+	#path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_modified # by wallpaper effects
+    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current # current wallpaper
     
     #color = $color7
 
diff --git a/config/hypr/UserScripts/Animations.sh b/config/hypr/scripts/Animations.sh
index 71368bbe..48ac0f85 100755
--- a/config/hypr/UserScripts/Animations.sh
+++ b/config/hypr/scripts/Animations.sh
@@ -17,7 +17,7 @@ UserConfigs="$HOME/.config/hypr/UserConfigs"
 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:")
+chosen_file=$(echo "$animations_list" | rofi -i -dmenu -config ~/.config/rofi/config-Animations.rasi)
 
 # Check if a file was selected
 if [[ -n "$chosen_file" ]]; then
@@ -26,10 +26,10 @@ if [[ -n "$chosen_file" ]]; then
     
     cp "$full_path" "$UserConfigs/UserAnimations.conf"
     
-    notify-send -u low -i "$iDIR/ja.png" "$chosen_file" "Animation Loaded"
+    notify-send -u low -i "$iDIR/ja.png" "$chosen_file" "Hyprland Animation Loaded"
 else
-    notify-send -u low -i "$iDIR/ja.png" "You chose to" "NOT apply other animations"
+    notify-send -u low -i "$iDIR/ja.png" "You chose NOT" "to apply other Hyprland animations"
 fi
 
 sleep 1
-"$SCRIPTSDIR/RefreshNoWaybar.sh"
+"$SCRIPTSDIR/RefreshNoWaybar.sh"
\ No newline at end of file
diff --git a/config/hypr/scripts/RofiSearch.sh b/config/hypr/scripts/RofiSearch.sh
index ccc73016..faf07865 100755
--- a/config/hypr/scripts/RofiSearch.sh
+++ b/config/hypr/scripts/RofiSearch.sh
@@ -13,5 +13,5 @@ if pgrep -x "rofi" >/dev/null; then
 fi
 
 # Open rofi with a dmenu and pass the selected item to xdg-open for Google search
-echo "" | rofi -dmenu -config "$rofi_config" -p "Search:" | xargs -I{} xdg-open "https://www.google.com/search?q={}"
+echo "" | rofi -dmenu -config "$rofi_config" | xargs -I{} xdg-open "https://www.google.com/search?q={}"