Merge pull request #402 from JaKooLit/main

Main to AGS-Dev

5 files changed, 22 insertions, 26 deletions

diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh
index 59f2e1df..d40f02ed 100755
--- a/config/hypr/scripts/PortalHyprland.sh
+++ b/config/hypr/scripts/PortalHyprland.sh
@@ -11,6 +11,6 @@ sleep 1
 /usr/lib/xdg-desktop-portal-hyprland &
 /usr/libexec/xdg-desktop-portal-hyprland &
 sleep 2
-/usr/lib/xdg-desktop-portal-hyprland &
+/usr/lib/xdg-desktop-portal &
 /usr/libexec/xdg-desktop-portal &
 
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index 42e70896..f7a3ec08 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -26,7 +26,7 @@ done
 ags -q
 
 sleep 0.3
-# Relaunch waybar
+#Restart waybar
 waybar &
 
 # relaunch swaync
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
index 55bdf997..9ef71f64 100755
--- a/config/hypr/scripts/SwitchKeyboardLayout.sh
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -6,29 +6,41 @@ layout_f="$HOME/.cache/kb_layout"
 settings_file="$HOME/.config/hypr/UserConfigs/UserSettings.conf"
 notif="$HOME/.config/swaync/images/bell.png"
 
+echo "Starting script..."
+
 # Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found
 if [ ! -f "$layout_f" ]; then
+  echo "Creating layout file as it does not exist..."
   default_layout=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null)
   if [ -z "$default_layout" ]; then
     default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found
   fi
   echo "$default_layout" > "$layout_f"
+  echo "Default layout set to $default_layout"
 fi
 
 current_layout=$(cat "$layout_f")
+echo "Current layout: $current_layout"
 
 # Read keyboard layout settings from Settings.conf
 if [ -f "$settings_file" ]; then
+  echo "Reading keyboard layout settings from $settings_file..."
   kb_layout_line=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2)
   IFS=',' read -ra layout_mapping <<< "$kb_layout_line"
+  echo "Available layouts: ${layout_mapping[@]}"
+else
+  echo "Settings file not found!"
+  exit 1
 fi
 
 layout_count=${#layout_mapping[@]}
+echo "Number of layouts: $layout_count"
 
 # Find the index of the current layout in the mapping
 for ((i = 0; i < layout_count; i++)); do
   if [ "$current_layout" == "${layout_mapping[i]}" ]; then
     current_index=$i
+    echo "Current layout index: $current_index"
     break
   fi
 done
@@ -36,10 +48,7 @@ done
 # Calculate the index of the next layout
 next_index=$(( (current_index + 1) % layout_count ))
 new_layout="${layout_mapping[next_index]}"
-
-# Update the keyboard layout
-hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout"
-echo "$new_layout" > "$layout_f"
+echo "Next layout: $new_layout"
 
 # Created by T-Crypt
 
@@ -51,7 +60,8 @@ change_layout() {
     local got_error=false
 
     while read -r name; do
-        hyprctl switchxkblayout "$name" next
+        echo "Switching layout for $name to $new_layout..."
+        hyprctl switchxkblayout "$name" "$new_layout"
         if [[ $? -eq 0 ]]; then
             echo "Switched the layout for $name."
         else
@@ -74,5 +84,8 @@ if ! change_layout; then
     exit 1
 else
     # Notification for the new keyboard layout
-	  notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+    notify-send -u low -i "$notif" "new KB_Layout: $new_layout"
+    echo "Layout change notification sent."
 fi
+
+echo "$new_layout" > "$layout_f"
diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
index 03029889..36cbeb10 100755
--- a/config/hypr/scripts/WaybarLayout.sh
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -24,15 +24,7 @@ menu() {
 # Apply selected configuration
 apply_config() {
     ln -sf "$waybar_layouts/$1" "$waybar_config"
-    restart_waybar_if_needed
-}
-
-# Restart Waybar
-restart_waybar_if_needed() {
-    if pgrep -x "waybar" >/dev/null; then
-        pkill waybar
-        sleep 0.1  # Delay for Waybar to completely terminate
-    fi
+    #restart_waybar_if_needed
     "${SCRIPTSDIR}/Refresh.sh" &
 }
 
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index 2e994780..95a348ba 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -26,15 +26,6 @@ menu() {
 # Apply selected style
 apply_style() {
     ln -sf "$waybar_styles/$1.css" "$waybar_style"
-    restart_waybar_if_needed
-}
-
-# Restart Waybar if it's running
-restart_waybar_if_needed() {
-    if pgrep -x "waybar" >/dev/null; then
-        pkill waybar
-        sleep 0.1  # Delay for Waybar to completely terminate
-    fi
     "${SCRIPTSDIR}/Refresh.sh" &
 }