Merge remote-tracking branch 'origin/development' into br-userconfigs

1 files changed, 31 insertions, 22 deletions

diff --git a/copy.sh b/copy.sh
index 4f20557d..7ee706ee 100755
--- a/copy.sh
+++ b/copy.sh
@@ -259,38 +259,39 @@ if command -v blueman-applet >/dev/null 2>&1; then
   grep -qx 'exec-once = blueman-applet' "$OVERLAY_SA" || echo 'exec-once = blueman-applet' >>"$OVERLAY_SA"
 fi
 
-# Check if ags is installed edit ags behaviour on configs
+# Check if ags is installed and enable it
 if command -v ags >/dev/null 2>&1; then
+  echo "${INFO} AGS detected - enabling in startup and refresh scripts" 2>&1 | tee -a "$LOG"
   OVERLAY_SA="config/hypr/UserConfigs/Startup_Apps.conf"
   mkdir -p "$(dirname "$OVERLAY_SA")"
   touch "$OVERLAY_SA"
   grep -qx 'exec-once = ags' "$OVERLAY_SA" || echo 'exec-once = ags' >>"$OVERLAY_SA"
   sed -i '/#ags -q && ags &/s/^#//' config/hypr/scripts/RefreshNoWaybar.sh
   sed -i '/#ags -q && ags &/s/^#//' config/hypr/scripts/Refresh.sh
-
-  # Uncomment the ags overview keybind
-  sed -i '/^#bind = \$mainMod, A, exec, pkill rofi || true && ags -t '\''overview'\''/s/^#//' config/hypr/UserConfigs/UserKeybinds.conf
-
-  # Comment the quickshell line if not already commented
-  sed -i '/^\s*bind\s*=\s*\$mainMod,\s*A,\s*global,\s*quickshell:overviewToggle/{s/^\s*/#/}' config/hypr/UserConfigs/UserKeybinds.conf
 fi
 
-# Check if quickshell is installed; edit quickshell behaviour on configs
+# Check if quickshell is installed and enable it
 if command -v qs >/dev/null 2>&1; then
+  echo "${INFO} Quickshell detected - enabling in startup and refresh scripts" 2>&1 | tee -a "$LOG"
   OVERLAY_SA="config/hypr/UserConfigs/Startup_Apps.conf"
   mkdir -p "$(dirname "$OVERLAY_SA")"
   touch "$OVERLAY_SA"
   grep -qx 'exec-once = qs' "$OVERLAY_SA" || echo 'exec-once = qs' >>"$OVERLAY_SA"
   sed -i '/#pkill qs && qs &/s/^#//' config/hypr/scripts/RefreshNoWaybar.sh
   sed -i '/#pkill qs && qs &/s/^#//' config/hypr/scripts/Refresh.sh
+fi
 
-  # Uncomment the quickshell keybind line
-  sed -i "/^#bind = \$mainMod, A, global, quickshell:overviewToggle/s/^#//" config/hypr/UserConfigs/UserKeybinds.conf
-
-  # Ensure the ags overview keybind is commented
-  sed -i "/^\s*bind\s*=\s*\\\$mainMod,\s*A,\s*exec,\s*pkill rofi\s*||\s*true\s*&&\s*ags\s*-t\s*'overview'/{s/^\s*/#/}" config/hypr/UserConfigs/UserKeybinds.conf
+# Ensure layout-aware keybinds init runs on startup (adds to user overlay so it survives composes)
+OVERLAY_SA="config/hypr/UserConfigs/Startup_Apps.conf"
+mkdir -p "$(dirname "$OVERLAY_SA")"
+if ! grep -qx 'exec-once = \$scriptsDir/KeybindsLayoutInit.sh' "$OVERLAY_SA"; then
+  echo 'exec-once = $scriptsDir/KeybindsLayoutInit.sh' >>"$OVERLAY_SA"
+  echo "${INFO} Added KeybindsLayoutInit.sh to user Startup_Apps overlay" 2>&1 | tee -a "$LOG"
 fi
 
+# Note: The SUPER+A keybind now uses OverviewToggle.sh which automatically
+# tries quickshell first and falls back to AGS, so both can be installed
+
 printf "\n%.0s" {1..1}
 
 # Checking if neovim or vim is installed and offer user if they want to make as default editor
@@ -413,11 +414,19 @@ while true; do
     sed -i 's#^\(\s*\)\("format": "{:%a %d | %H:%M}",\) #\1//\2#g' config/waybar/Modules 2>&1 | tee -a "$LOG"
 
     # for hyprlock
-    sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
-    sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/\1    text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
+    HYPRLOCK_FILE="config/hypr/hyprlock.conf"
+    if [ ! -f "$HYPRLOCK_FILE" ] && [ -f "config/hypr/hyprlock-1080p.conf" ]; then
+      HYPRLOCK_FILE="config/hypr/hyprlock-1080p.conf"
+    fi
+    if [ -f "$HYPRLOCK_FILE" ]; then
+      sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' "$HYPRLOCK_FILE" 2>&1 | tee -a "$LOG"
+      sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/\1    text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' "$HYPRLOCK_FILE" 2>&1 | tee -a "$LOG"
 
-    sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
-    sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/\1    text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG"
+      sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' "$HYPRLOCK_FILE" 2>&1 | tee -a "$LOG"
+      sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/\1    text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' "$HYPRLOCK_FILE" 2>&1 | tee -a "$LOG"
+    else
+      echo "${WARN} hyprlock template not found; skipping 12H lock format edits" 2>&1 | tee -a "$LOG"
+    fi
 
     echo "${OK} 12H format set on waybar clocks succesfully." 2>&1 | tee -a "$LOG"
 
@@ -853,7 +862,11 @@ compose_overlay_from_backup() {
     grep -E '^\s*exec-once\s*=' "$base_file" | sed -E 's/^\s+//;s/\s+$//' | sort -u >"$base_file.tmp.exec"
     comm -23 "$old_user_file.tmp.exec" "$base_file.tmp.exec" >"$new_user_file"
     # treat commented exec-once in old user as disables
-    grep -E '^\s*#\s*exec-once\s*=' "$old_user_file" | sed -E 's/^\s*#\s*exec-once\s*=\s*//' | sed -E 's/^\s+//;s/\s+$//' | sort -u >"$disable_file"
+    grep -E '^\s*#\s*exec-once\s*=' "$old_user_file" \
+      | sed -E 's/^\s*#\s*exec-once\s*=\s*//' \
+      | sed -E 's/^\s+//;s/\s+$//' \
+      | grep -Ev '^\$scriptsDir/KeybindsLayoutInit\.sh$' \
+      | sort -u >"$disable_file"
     rm -f "$old_user_file.tmp.exec" "$base_file.tmp.exec"
   elif [ "$type" = "windowrules" ]; then
     # additions
@@ -920,10 +933,6 @@ if [ -d "$BACKUP_DIR_PATH" ]; then
   done
 fi
 
-# Compose merged configs (Startup_Apps and WindowRules)
-if [ -x "$DIRPATH/scripts/ComposeHyprConfigs.sh" ]; then
-  "$DIRPATH/scripts/ComposeHyprConfigs.sh" 2>&1 | tee -a "$LOG" || true
-fi
 
 printf "\n%.0s" {1..1}