Merge branch 'main' into feat/add-custom-hyprpicker-waybar-module

10 files changed, 86 insertions, 39 deletions

diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 3358e07a..871f2ffb 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -7,10 +7,12 @@
 
 # /* ---- ✴️ Variables ✴️ ---- */  #
 $mainMod = SUPER
-$files = thunar
-$term = kitty
 $scriptsDir = $HOME/.config/hypr/scripts
 $UserScripts = $HOME/.config/hypr/UserScripts
+$UserConfigs = $HOME/.config/hypr/UserConfigs
+
+# settings for User defaults apps - set your default terminal and file manager on this file
+source= $UserConfigs/01-UserDefaults.conf 
 
 # common shortcuts
 #bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 781e9f64..1cddce09 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -58,7 +58,10 @@ play_local_music() {
   # Find the corresponding file path based on user's choice and set that to play the song then continue on the list
   for (( i=0; i<"${#filenames[@]}"; ++i )); do
     if [ "${filenames[$i]}" = "$choice" ]; then
-		
+
+      if music_playing; then
+        stop_music
+      fi
 	    notification "$choice"
       mpv --playlist-start="$i" --loop-playlist --vid=no  "${local_music[@]}"
 
@@ -69,6 +72,9 @@ play_local_music() {
 
 # Main function for shuffling local music
 shuffle_local_music() {
+  if music_playing; then
+    stop_music
+  fi
   notification "Shuffle Play local music"
 
   # Play music in $mDIR on shuffle
@@ -87,12 +93,20 @@ play_online_music() {
 
   link="${online_music[$choice]}"
 
+  if music_playing; then
+    stop_music
+  fi
   notification "$choice"
   
   # Play the selected online music using mpv
   mpv --shuffle --vid=no "$link"
 }
 
+# Function to check if music is already playing
+music_playing() {
+  pgrep -x "mpv" > /dev/null
+}
+
 # Function to stop music and kill mpv processes
 stop_music() {
   mpv_pids=$(pgrep -x mpv)
@@ -110,25 +124,30 @@ stop_music() {
   fi
 }
 
-# Check if music is already playing
-if pgrep -x "mpv" > /dev/null; then
-  stop_music
-else
-  user_choice=$(printf "Play from Online Stations\nPlay from Music directory\nShuffle Play from Music directory" | rofi -dmenu -config $rofi_theme_1)
+user_choice=$(printf "%s\n" \
+  "Play from Online Stations" \
+  "Play from Music directory" \
+  "Shuffle Play from Music directory" \
+  "Stop RofiBeats" \
+  | rofi -dmenu -config $rofi_theme_1)
 
-  echo "User choice: $user_choice"
+echo "User choice: $user_choice"
 
-  case "$user_choice" in
-    "Play from Music directory")
-      play_local_music
-      ;;
-    "Play from Online Stations")
-      play_online_music
-      ;;
-    "Shuffle Play from Music directory")
-      shuffle_local_music
-      ;;
-    *)
-      ;;
-  esac
-fi
\ No newline at end of file
+case "$user_choice" in
+  "Play from Online Stations")
+    play_online_music
+    ;;
+  "Play from Music directory")
+    play_local_music
+    ;;
+  "Shuffle Play from Music directory")
+    shuffle_local_music
+    ;;
+  "Stop RofiBeats")
+    if music_playing; then
+      stop_music
+    fi
+    ;;
+  *)
+    ;;
+esac
diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh
index 0294e042..9bdaff4a 100755
--- a/config/hypr/UserScripts/Weather.sh
+++ b/config/hypr/UserScripts/Weather.sh
@@ -84,4 +84,4 @@ echo -e "{\"text\":\""$temperature $condition"\", \"alt\":\""${weather[0]}"\", \
 
 cached_weather=" $temperature  \n$condition ${weather[1]}"
 
-echo -e $cached_weather >  "$HOME/.cache/.weather_cache"
+echo -e $cached_weather >  "$HOME/.cache/.weather_cache"
\ No newline at end of file
diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index 8fc3b075..a0e105e0 100644
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -66,7 +66,7 @@ label {
     color = $color12
     font_size = 200
     font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -320
+    position = 0, -340
     halign = center
     valign = top
 }
@@ -106,16 +106,15 @@ label {
     color = $color13
     font_size = 24
     font_family = Victor Mono Bold Oblique
-    position = 0, 150
+    position = 0, 220
     halign = center
     valign = bottom
 }
 
-
 # INPUT FIELD
 input-field {
     monitor =
-    size = 300, 60
+    size = 200, 60
     outline_thickness = 2
     dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
@@ -128,7 +127,19 @@ input-field {
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 50
+    position = 0, 100
+    halign = center
+    valign = bottom
+}
+
+# Keyboard LAYOUT
+label {
+    monitor =
+    text = $LAYOUT
+    color = $color13
+    font_size = 10
+    font_family = Victor Mono Bold Oblique
+    position = 0, 70
     halign = center
     valign = bottom
 }
@@ -157,4 +168,4 @@ label {
     position = 50, 0
     halign = left
     valign = bottom
-}
\ No newline at end of file
+}
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index a3cbb76f..48b09b85 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -106,12 +106,11 @@ label {
     color = $color13
     font_size = 24
     font_family = Victor Mono Bold Oblique
-    position = 0, 200
+    position = 0, 280
     halign = center
     valign = bottom
 }
 
-
 # INPUT FIELD
 input-field {
     monitor =
@@ -128,7 +127,20 @@ input-field {
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 100
+    position = 0, 120
+    halign = center
+    valign = bottom
+}
+
+
+# Keyboard LAYOUT
+label {
+    monitor =
+    text = $LAYOUT
+    color = $color13
+    font_size = 12
+    font_family = Victor Mono Bold Oblique
+    position = 0, 80
     halign = center
     valign = bottom
 }
@@ -157,4 +169,4 @@ label {
     position = 50, 0
     halign = left
     valign = bottom
-}
\ No newline at end of file
+}
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index 90e2dfd2..0a37c7e4 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -4,7 +4,7 @@
 
 # variables
 time=$(date "+%d-%b_%H-%M-%S")
-dir="$(xdg-user-dir)/Pictures/Screenshots"
+dir="$(xdg-user-dir PICTURES)/Screenshots"
 file="Screenshot_${time}_${RANDOM}.png"
 
 iDIR="$HOME/.config/swaync/icons"
diff --git a/config/hypr/scripts/WaybarScripts.sh b/config/hypr/scripts/WaybarScripts.sh
index 32b43f02..7b3aaba2 100755
--- a/config/hypr/scripts/WaybarScripts.sh
+++ b/config/hypr/scripts/WaybarScripts.sh
@@ -32,10 +32,13 @@ elif [[ "$1" == "--nmtui" ]]; then
     $term nmtui
 elif [[ "$1" == "--term" ]]; then
     $term &
+elif [[ "$1" == "--files" ]]; then
+    $files &
 else
     echo "Usage: $0 [--btop | --nvtop | --nmtui | --term]"
     echo "--btop       : Open btop in a new term"
     echo "--nvtop      : Open nvtop in a new term"
     echo "--nmtui      : Open nmtui in a new term"
     echo "--term   : Launch a term window"
-fi
+    echo "--files  : Launch a file manager"
+fi
\ No newline at end of file
diff --git a/config/rofi/config-kitty-theme.rasi b/config/rofi/config-kitty-theme.rasi
index 5dc570be..f62fea12 100644
--- a/config/rofi/config-kitty-theme.rasi
+++ b/config/rofi/config-kitty-theme.rasi
@@ -32,7 +32,7 @@ inputbar {
 
 entry {
   expand: true;
-  placeholder: " 🐾  Search / Choose Kitty theme";
+  placeholder: " 🐾  Choose Kitty theme: Enter to Preview; CTRL S to Apply";
 }
 
 /* ---- Listview ---- */
diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi
index aa3e8258..47e14b0d 100644
--- a/config/rofi/config-rofi-Beats-menu.rasi
+++ b/config/rofi/config-rofi-Beats-menu.rasi
@@ -30,7 +30,7 @@ listview {
   fixed-columns: false;
   scrollbar: false;
   colums: 1;
-  lines: 3;
+  lines: 4;
   spacing: 6px;
   cycle: true;
 }
diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom
index c06cd7ac..dddc5ccc 100644
--- a/config/waybar/ModulesCustom
+++ b/config/waybar/ModulesCustom
@@ -26,7 +26,7 @@
 
 "custom/file_manager": {
 	"format": " ",
-	"on-click": "xdg-open . &",
+	"on-click": "$HOME/.config/hypr/scripts/WaybarScripts.sh --files",
 	"tooltip": true,
 	"tooltip-format": "File Manager",
 },