From 4687cfc8c6786ebaae169e19219f1cf9f3be982d Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Fri, 31 Oct 2025 19:22:24 -0400
Subject: SWWW v0.11.2 uses swww-daemon --format argb now

 Changed the flag for updated SWWW

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   config/hypr/UserConfigs/Startup_Apps.conf
---
 config/hypr/UserConfigs/Startup_Apps.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 2f5c7ae7..4f4fbd22 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -10,7 +10,8 @@ $SwwwRandom = $UserScripts/WallpaperAutoChange.sh
 $livewallpaper=""
 
 # wallpaper stuff 
-exec-once = swww-daemon --format xrgb
+exec-once = swww-daemon --format argb   # New flag for v0.11.2 
+#exec-once = swww-daemon --format xrgb  # old 0.9.5 option
 #exec-once = mpvpaper '*' -o "load-scripts=no no-audio --loop" $livewallpaper
 
 # wallpaper random
-- 
cgit v1.2.3


From 7441f2cb05b6916ff7cb08a8c0f14b7ff865a1b1 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Sun, 2 Nov 2025 17:23:53 -0500
Subject: feat: Add smart AGS/Quickshell fallback with OverviewToggle wrapper

Implements a robust fallback mechanism for desktop overview functionality
that handles both AGS and Quickshell installations gracefully.

Changes:
- Add OverviewToggle.sh wrapper script that tries Quickshell first,
  falls back to AGS if unavailable or broken
- Update UserKeybinds.conf with new SUPER+A binding to OverviewToggle.sh
- Preserve original AGS and Quickshell keybinds as commented references
- Simplify copy.sh logic to enable both AGS and QS simultaneously
- Remove conflicting keybind toggle logic from copy.sh

Benefits:
- Users can have both AGS and Quickshell installed simultaneously
- Automatic fallback when one tool is broken or unavailable
- Quickshell preferred (tried first) as it's more performant
- Graceful degradation with user notification if neither available
- Auto-starts AGS if installed but not running
- Compatible with existing upgrade.sh and ComposeHyprConfigs.sh workflow

Technical details:
- OverviewToggle.sh checks for running processes before attempting toggle
- Uses hyprctl dispatch for Quickshell's global dispatcher
- Falls back to ags -t 'overview' with rofi cleanup for AGS
- Shows desktop notification if neither tool is available
- Script auto-made executable via existing chmod in copy.sh (line 1027)

Addresses: Issue where AGS and Quickshell have had recent stability
           problems, requiring manual keybind switching between them
---
 config/hypr/UserConfigs/UserKeybinds.conf |  1 +
 config/hypr/scripts/OverviewToggle.sh     | 28 ++++++++++++++++++++++++++++
 copy.sh                                   | 21 +++++++--------------
 3 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 config/hypr/scripts/OverviewToggle.sh

diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 4bebe342..17711559 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -18,6 +18,7 @@ source= $UserConfigs/01-UserDefaults.conf
 #bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
 bindd = $mainMod, D, app launcher, exec, pkill rofi || true && rofi -show drun -modi drun,filebrowser,run,window
 bindd = $mainMod, B, open default browser, exec, xdg-open "https://"
+bindd = $mainMod, A, desktop overview, exec, $scriptsDir/OverviewToggle.sh # toggles quickshell or ags overview (tries QS first, falls back to AGS)
 #bindd = $mainMod, A, ags overview, exec, pkill rofi || true && ags -t 'overview' # desktop overview (if installed)
 #bindd = $mainMod, A, Quickshell overview, global, quickshell:overviewToggle # desktop overview (if installed)
 bindd = $mainMod, Return, Open terminal, exec, $term
diff --git a/config/hypr/scripts/OverviewToggle.sh b/config/hypr/scripts/OverviewToggle.sh
new file mode 100644
index 00000000..18683984
--- /dev/null
+++ b/config/hypr/scripts/OverviewToggle.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Overview toggle wrapper - tries quickshell first, falls back to AGS
+
+# Try quickshell first if installed
+if command -v qs >/dev/null 2>&1; then
+  # Check if quickshell is running
+  if pgrep -x qs >/dev/null 2>&1; then
+    # Try to toggle quickshell overview
+    hyprctl dispatch global quickshell:overviewToggle 2>/dev/null && exit 0
+  fi
+fi
+
+# Fall back to AGS if quickshell failed or isn't available
+if command -v ags >/dev/null 2>&1; then
+  # Check if AGS is running, start it if not
+  if ! pgrep -x ags >/dev/null 2>&1; then
+    ags &
+    sleep 0.5
+  fi
+  # Toggle AGS overview
+  pkill rofi || true
+  ags -t 'overview' 2>/dev/null && exit 0
+fi
+
+# If we get here, neither worked
+notify-send "Overview" "Neither Quickshell nor AGS is available" -u low 2>/dev/null || true
+exit 1
diff --git a/copy.sh b/copy.sh
index 762af601..b4e958a9 100755
--- a/copy.sh
+++ b/copy.sh
@@ -259,38 +259,31 @@ 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
-
-  # 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
 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
-- 
cgit v1.2.3


From c97e7c0e636ab0f1cd053c3228fa4b8f3c0cd388 Mon Sep 17 00:00:00 2001
From: Alberson Miranda <albersonmiranda@hotmail.com>
Date: Sun, 2 Nov 2025 21:19:10 -0300
Subject: hotfix: remove hypersunset from status group.

---
 config/waybar/ModulesGroups | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/waybar/ModulesGroups b/config/waybar/ModulesGroups
index 8d4453a2..30e47f16 100644
--- a/config/waybar/ModulesGroups
+++ b/config/waybar/ModulesGroups
@@ -89,7 +89,6 @@
         },
 	"modules": [
 		"custom/power",
-		"custom/nightlight",
 		"custom/lock",
 		"keyboard-state",
 		"custom/keyboard",
@@ -132,7 +131,6 @@
        },
      "modules": [
         "custom/power",
-        "custom/nightlight",
         "custom/lock",
         "custom/logout",
         "custom/reboot"
-- 
cgit v1.2.3


From f992b375bfaf76e82df939ac16502755984db53e Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Mon, 3 Nov 2025 22:27:24 -0500
Subject: scripts is config/hypr/scripts weren't executable

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   scripts/Battery.sh
	modified:   scripts/ComposeHyprConfigs.sh
	modified:   scripts/OverviewToggle.sh
	modified:   scripts/sddm_wallpaper.sh
---
 config/hypr/scripts/Battery.sh            |  0
 config/hypr/scripts/ComposeHyprConfigs.sh |  0
 config/hypr/scripts/OverviewToggle.sh     | 37 +++++++++++++++++++------------
 config/hypr/scripts/sddm_wallpaper.sh     |  0
 4 files changed, 23 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 config/hypr/scripts/Battery.sh
 mode change 100644 => 100755 config/hypr/scripts/ComposeHyprConfigs.sh
 mode change 100644 => 100755 config/hypr/scripts/OverviewToggle.sh
 mode change 100644 => 100755 config/hypr/scripts/sddm_wallpaper.sh

diff --git a/config/hypr/scripts/Battery.sh b/config/hypr/scripts/Battery.sh
old mode 100644
new mode 100755
diff --git a/config/hypr/scripts/ComposeHyprConfigs.sh b/config/hypr/scripts/ComposeHyprConfigs.sh
old mode 100644
new mode 100755
diff --git a/config/hypr/scripts/OverviewToggle.sh b/config/hypr/scripts/OverviewToggle.sh
old mode 100644
new mode 100755
index 18683984..21c2da34
--- a/config/hypr/scripts/OverviewToggle.sh
+++ b/config/hypr/scripts/OverviewToggle.sh
@@ -1,26 +1,35 @@
 #!/usr/bin/env bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Overview toggle wrapper - tries quickshell first, falls back to AGS
+# Overview toggle wrapper - tries Quickshell first, falls back to AGS
 
-# Try quickshell first if installed
+set -euo pipefail
+
+# 1) Try Quickshell via Hyprland global dispatch (works if QS is running and listening)
+if hyprctl dispatch global quickshell:overviewToggle >/dev/null 2>&1; then
+  exit 0
+fi
+
+# If QS isn't running, try starting it and retry once
 if command -v qs >/dev/null 2>&1; then
-  # Check if quickshell is running
-  if pgrep -x qs >/dev/null 2>&1; then
-    # Try to toggle quickshell overview
-    hyprctl dispatch global quickshell:overviewToggle 2>/dev/null && exit 0
+  qs >/dev/null 2>&1 &
+  sleep 0.6
+  if hyprctl dispatch global quickshell:overviewToggle >/dev/null 2>&1; then
+    exit 0
   fi
 fi
 
-# Fall back to AGS if quickshell failed or isn't available
+# 2) Fall back to AGS template
 if command -v ags >/dev/null 2>&1; then
-  # Check if AGS is running, start it if not
-  if ! pgrep -x ags >/dev/null 2>&1; then
-    ags &
-    sleep 0.5
-  fi
-  # Toggle AGS overview
   pkill rofi || true
-  ags -t 'overview' 2>/dev/null && exit 0
+  if ags -t 'overview' >/dev/null 2>&1; then
+    exit 0
+  fi
+  # If it failed, try starting AGS daemon then call the template
+  ags >/dev/null 2>&1 &
+  sleep 0.6
+  if ags -t 'overview' >/dev/null 2>&1; then
+    exit 0
+  fi
 fi
 
 # If we get here, neither worked
diff --git a/config/hypr/scripts/sddm_wallpaper.sh b/config/hypr/scripts/sddm_wallpaper.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From c9c54016a8675448eba7accdea9978f8d780725c Mon Sep 17 00:00:00 2001
From: mio-dokuhaki <a214mm040s@std.kurume-u.ac.jp>
Date: Wed, 5 Nov 2025 02:24:25 +0900
Subject: feat(rofi): merge RofiBeats dynamic music system into development

---
 config/hypr/UserScripts/RofiBeats.sh | 205 ++++++++++++++++-------------------
 config/rofi/online_music.list        |  17 +++
 2 files changed, 111 insertions(+), 111 deletions(-)
 create mode 100644 config/rofi/online_music.list

diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index ca566019..adb5aa2c 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -1,35 +1,39 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# For Rofi Beats to play online Music or Locally saved media files
+# RofiBeats - unified, dynamic UI (add, remove, manage, play)
 
-# Variables
 mDIR="$HOME/Music/"
 iDIR="$HOME/.config/swaync/icons"
 rofi_theme="$HOME/.config/rofi/config-rofi-Beats.rasi"
-rofi_theme_1="$HOME/.config/rofi/config-rofi-Beats-menu.rasi"
+rofi_theme_menu="$HOME/.config/rofi/config-rofi-Beats-menu.rasi"
+music_list="$HOME/.config/rofi/online_music.list"
 
-# Online Stations. Edit as required
-declare -A online_music=(
-  ["FM - Easy Rock 96.3 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
-  ["FM - Easy Rock - Baguio 91.9 📻🎶"]="https://radio-stations-philippines.com/easy-rock-baguio" 
-  ["FM - Love Radio 90.7 📻🎶"]="https://radio-stations-philippines.com/love"
-  ["FM - WRock - CEBU 96.3 📻🎶"]="https://onlineradio.ph/126-96-3-wrock.html"
-  ["FM - Fresh Philippines 📻🎶"]="https://onlineradio.ph/553-fresh-fm.html"
-  ["Radio - Lofi Girl 🎧🎶"]="https://play.streamafrica.net/lofiradio"
-  ["Radio - Chillhop 🎧🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
-  ["Radio - Ibiza Global 🎧🎶"]="https://filtermusic.net/ibiza-global"
-  ["Radio - Metal Music 🎧🎶"]="https://tunein.com/radio/mETaLmuSicRaDio-s119867/"
-  ["YT - Wish 107.5 YT Pinoy HipHop 📻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
-  ["YT - Youtube Top 100 Songs Global 📹🎶"]="https://youtube.com/playlist?list=PL4fGSI1pDJn6puJdseH2Rt9sMvt9E2M4i&si=5jsyfqcoUXBCSLeu"
-  ["YT - Wish 107.5 YT Wishclusives 📹🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
-  ["YT - Relaxing Piano Music 🎹🎶"]="https://youtu.be/6H7hXzjFoVU?si=nZTPREC9lnK1JJUG"
-  ["YT - Youtube Remix 📹🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0"
-  ["YT - Korean Drama OST 📹🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ"
-  ["YT - lofi hip hop radio beats 📹🎶"]="https://www.youtube.com/live/jfKfPfyJRdk?si=PnJIA9ErQIAw6-qd"
-  ["YT - Relaxing Piano Jazz Music 🎹🎶"]="https://youtu.be/85UEqRat6E4?si=jXQL1Yp2VP_G6NSn"
-)
+mkdir -p "$(dirname "$music_list")"
+[[ -f "$music_list" ]] || touch "$music_list"
 
-# Populate local_music array with files from music directory and subdirectories
+# Send notification
+notification() {
+  notify-send -u normal -i "$iDIR/music.png" "$@"
+}
+
+# Check if mpv is currently playing
+music_playing() { pgrep -x "mpv" >/dev/null; }
+
+# Stop all mpv processes except mpvpaper
+stop_music() {
+  mpv_pids=$(pgrep -x mpv)
+  if [ -n "$mpv_pids" ]; then
+    mpvpaper_pid=$(ps aux | grep -- 'unique-wallpaper-process' | grep -v 'grep' | awk '{print $2}')
+    for pid in $mpv_pids; do
+      if ! echo "$mpvpaper_pid" | grep -q "$pid"; then
+        kill -9 $pid || true
+      fi
+    done
+    notification "Music stopped"
+  fi
+}
+
+# Populate local music file list
 populate_local_music() {
   local_music=()
   filenames=()
@@ -39,115 +43,94 @@ populate_local_music() {
   done < <(find -L "$mDIR" -type f \( -iname "*.mp3" -o -iname "*.flac" -o -iname "*.wav" -o -iname "*.ogg" -o -iname "*.mp4" \))
 }
 
-# Function for displaying notifications
-notification() {
-  notify-send -u normal -i "$iDIR/music.png" "Now Playing:" "$@"
-}
-
-# Main function for playing local music
+# Play selected local music file
 play_local_music() {
   populate_local_music
-
-  # Prompt the user to select a song
-  choice=$(printf "%s\n" "${filenames[@]}" | rofi -i -dmenu -config $rofi_theme)
-
-  if [ -z "$choice" ]; then
-    exit 1
-  fi
-
-  # 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
+  choice=$(printf "%s\n" "${filenames[@]}" | rofi -i -dmenu -config "$rofi_theme" \
+    -theme-str 'entry { placeholder: "🎵 Choose Local Music"; }')
+  [[ -z "$choice" ]] && exit 1
+  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[@]}"
-
+      music_playing && stop_music
+      notification "Now Playing:" "$choice"
+      mpv --no-video --playlist-start="$i" --loop-playlist "${local_music[@]}"
       break
     fi
   done
 }
 
-# Main function for shuffling local music
+# Shuffle and play all local music
 shuffle_local_music() {
-  if music_playing; then
-    stop_music
-  fi
+  music_playing && stop_music
   notification "Shuffle Play local music"
-
-  # Play music in $mDIR on shuffle
-  mpv --shuffle --loop-playlist --vid=no "$mDIR"
+  mpv --no-video --shuffle --loop-playlist "$mDIR"
 }
 
-# Main function for playing online music
+# Play selected online music
 play_online_music() {
-  choice=$(for online in "${!online_music[@]}"; do
-      echo "$online"
-    done | sort | rofi -i -dmenu -config "$rofi_theme")
-
-  if [ -z "$choice" ]; then
-    exit 1
-  fi
-
-  link="${online_music[$choice]}"
-
-  if music_playing; then
-    stop_music
+  if [ ! -s "$music_list" ]; then
+    notify-send -u low -i "$iDIR/music.png" "No online music found" "Add some with Manage Music"
+    exit 0
   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
+  choice=$(awk -F'|' '{print $1}' "$music_list" | sort | rofi -i -dmenu -config "$rofi_theme" \
+    -theme-str 'entry { placeholder: "🌐 Choose Online Station"; }')
+  [[ -z "$choice" ]] && exit 1
+  link=$(awk -F'|' -v name="$choice" '$1 == name {print $2; exit}' "$music_list")
+  [[ -z "$link" ]] && {
+    notify-send -u low -i "$iDIR/music.png" "URL not found for" "$choice"
+    exit 1
+  }
+  music_playing && stop_music
+  notification "Now Playing:" "$choice"
+  mpv --no-video --shuffle "$link"
 }
 
-# Function to stop music and kill mpv processes
-stop_music() {
-  mpv_pids=$(pgrep -x mpv)
-
-  if [ -n "$mpv_pids" ]; then
-    # Get the PID of the mpv process used by mpvpaper (using the unique argument added)
-    mpvpaper_pid=$(ps aux | grep -- 'unique-wallpaper-process' | grep -v 'grep' | awk '{print $2}')
-
-    for pid in $mpv_pids; do
-      if ! echo "$mpvpaper_pid" | grep -q "$pid"; then
-        kill -9 $pid || true 
-      fi
-    done
-    notify-send -u low -i "$iDIR/music.png" "Music stopped" || true
-  fi
+# Manage online music list (add, remove, view)
+manage_music() {
+  sub_choice=$(printf "Add Music\nRemove Music\nView List" | rofi -dmenu \
+    -config "$rofi_theme_menu" \
+    -theme-str 'entry { placeholder: "🛠️ Manage Music List"; }')
+
+  case "$sub_choice" in
+  "Add Music")
+    name=$(rofi -dmenu -lines 0 -config "$rofi_theme_menu" \
+      -theme-str 'entry { placeholder: "🎼 Enter Music Title"; }')
+    [[ -z "$name" ]] && return
+    url=$(rofi -dmenu -lines 0 -config "$rofi_theme_menu" \
+      -theme-str 'entry { placeholder: "🔗 Enter Music URL"; }')
+    [[ -z "$url" ]] && return
+    echo "$name|$url" >>"$music_list"
+    notification "Added" "$name"
+    ;;
+  "Remove Music")
+    entry=$(awk -F'|' '{print $1}' "$music_list" | rofi -dmenu -config "$rofi_theme_menu" \
+      -theme-str 'entry { placeholder: "🗑️ Select Music to Remove"; }')
+    [[ -z "$entry" ]] && return
+    grep -vF "$entry" "$music_list" >"$music_list.tmp" && mv "$music_list.tmp" "$music_list"
+    notification "Removed" "$entry"
+    ;;
+  "View List")
+    # Show only titles, not URLs
+    awk -F'|' '{print $1}' "$music_list" | rofi -dmenu -config "$rofi_theme_menu" \
+      -theme-str 'entry { placeholder: "📜 Online Music List"; }' >/dev/null
+    ;;
+  esac
 }
 
+# Main menu
 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"
+  "Manage Music List" |
+  rofi -dmenu -config "$rofi_theme_menu" \
+    -theme-str 'entry { placeholder: "🎧 RofiBeats Menu"; }')
 
 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
-    ;;
-  *)
-    ;;
+"Play from Online Stations") play_online_music ;;
+"Play from Music directory") play_local_music ;;
+"Shuffle Play from Music directory") shuffle_local_music ;;
+"Stop RofiBeats") music_playing && stop_music ;;
+"Manage Music List") manage_music ;;
 esac
diff --git a/config/rofi/online_music.list b/config/rofi/online_music.list
new file mode 100644
index 00000000..bb21b9d4
--- /dev/null
+++ b/config/rofi/online_music.list
@@ -0,0 +1,17 @@
+FM - Easy Rock 96.3 📻🎶|https://radio-stations-philippines.com/easy-rock
+FM - Easy Rock - Baguio 91.9 📻🎶|https://radio-stations-philippines.com/easy-rock-baguio
+FM - Love Radio 90.7 📻🎶|https://radio-stations-philippines.com/love
+FM - WRock - CEBU 96.3 📻🎶|https://onlineradio.ph/126-96-3-wrock.html
+FM - Fresh Philippines 📻🎶|https://onlineradio.ph/553-fresh-fm.html
+Radio - Lofi Girl 🎧🎶|https://play.streamafrica.net/lofiradio
+Radio - Chillhop 🎧🎶|http://stream.zeno.fm/fyn8eh3h5f8uv
+Radio - Ibiza Global 🎧🎶|https://filtermusic.net/ibiza-global
+Radio - Metal Music 🎧🎶|https://tunein.com/radio/mETaLmuSicRaDio-s119867/
+YT - Wish 107.5 YT Pinoy HipHop 📻🎶|https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37
+YT - Youtube Top 100 Songs Global 📹🎶|https://youtube.com/playlist?list=PL4fGSI1pDJn6puJdseH2Rt9sMvt9E2M4i&si=5jsyfqcoUXBCSLeu
+YT - Wish 107.5 YT Wishclusives 📹🎶|https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO
+YT - Relaxing Piano Music 🎹🎶|https://youtu.be/6H7hXzjFoVU?si=nZTPREC9lnK1JJUG
+YT - Youtube Remix 📹🎶|https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0
+YT - Korean Drama OST 📹🎶|https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ
+YT - lofi hip hop radio beats 📹🎶|https://www.youtube.com/live/jfKfPfyJRdk?si=PnJIA9ErQIAw6-qd
+YT - Relaxing Piano Jazz Music 🎹🎶|https://youtu.be/85UEqRat6E4?si=jXQL1Yp2VP_G6NSn
-- 
cgit v1.2.3


From 073fc0fb287777e39e6b9089a5db7a7cf010f24f Mon Sep 17 00:00:00 2001
From: mio-dokuhaki <a214mm040s@std.kurume-u.ac.jp>
Date: Wed, 5 Nov 2025 02:43:32 +0900
Subject: fix(rofi): update RofiBeats shebang to /usr/bin/env bash

---
 config/hypr/UserScripts/RofiBeats.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index adb5aa2c..a002a518 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # RofiBeats - unified, dynamic UI (add, remove, manage, play)
 
-- 
cgit v1.2.3


From ebae2be8c6cc37fd6e66baaac18368789ee97851 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 00:50:08 -0500
Subject: feat(hypr): align SUPER+J/K binds to current layout on startup\n\n-
 Add scripts/KeybindsLayoutInit.sh to set J/K (and O for togglesplit) based on
 general:layout\n- Wire via Startup_Apps.conf (exec-once) so default dwindle
 or master both get correct binds\n- Complements scripts/ChangeLayout.sh
 dynamic rebinds

---
 config/hypr/configs/Startup_Apps.conf     |  1 +
 config/hypr/scripts/KeybindsLayoutInit.sh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100755 config/hypr/scripts/KeybindsLayoutInit.sh

diff --git a/config/hypr/configs/Startup_Apps.conf b/config/hypr/configs/Startup_Apps.conf
index d952e65b..07a92a3f 100644
--- a/config/hypr/configs/Startup_Apps.conf
+++ b/config/hypr/configs/Startup_Apps.conf
@@ -19,6 +19,7 @@ exec-once = swww-daemon --format xrgb
 # Startup
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = $scriptsDir/KeybindsLayoutInit.sh
 
 # Initialize Drop Down terminal - See Bug#810 https://github.com/JaKooLit/Hyprland-Dots/issues/810#issuecomment-3351947644
 exec-once = $HOME/.config/hypr/scripts/Dropterminal.sh kitty &
diff --git a/config/hypr/scripts/KeybindsLayoutInit.sh b/config/hypr/scripts/KeybindsLayoutInit.sh
new file mode 100755
index 00000000..7e328cde
--- /dev/null
+++ b/config/hypr/scripts/KeybindsLayoutInit.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Initialize J/K keybinds to match the current default layout at startup
+
+# Query current layout (master|dwindle)
+LAYOUT=$(hyprctl -j getoption general:layout | jq -r '.str')
+
+case "$LAYOUT" in
+  master)
+    # Ensure master layout-style binds
+    hyprctl keyword unbind SUPER,J
+    hyprctl keyword unbind SUPER,K
+    hyprctl keyword unbind SUPER,O
+    hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
+    hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
+    ;;
+  dwindle)
+    # Ensure dwindle layout-style binds
+    hyprctl keyword unbind SUPER,J
+    hyprctl keyword unbind SUPER,K
+    hyprctl keyword unbind SUPER,O
+    hyprctl keyword bind SUPER,J,cyclenext
+    hyprctl keyword bind SUPER,K,cyclenext,prev
+    hyprctl keyword bind SUPER,O,togglesplit
+    ;;
+  *)
+    # Do nothing for unexpected values
+    :
+    ;;
+ esac
-- 
cgit v1.2.3


From 3665ebd0f02a04e44d382d4cc9f306525e02279d Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 02:11:21 -0500
Subject: feat(hypr): source composed generated/Startup_Apps.conf and
 WindowRules.conf\n\n- Hypr now loads ~/.config/hypr/generated outputs from
 ComposeHyprConfigs.sh\n- Avoids confusion when UserConfigs/Startup_Apps.conf
 is only an overlay

---
 config/hypr/hyprland.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index fa8435dc..1cf7bd31 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -9,13 +9,15 @@ exec-once = $HOME/.config/hypr/initial-boot.sh
 
 # Sourcing external config files
 $configs = $HOME/.config/hypr/configs # Default Configs directory path
+$Generated = $HOME/.config/hypr/generated # Composed configs (base + user overlays)
 
 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
+# Use composed Startup_Apps (base + user overlay + disables)
+source= $Generated/Startup_Apps.conf
 
 source= $UserConfigs/ENVariables.conf # Environment variables to load
 
@@ -26,7 +28,8 @@ 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
+# Use composed WindowRules (base + user overlay + disables)
+source= $Generated/WindowRules.conf # all about Hyprland Window Rules and Layer Rules
 
 source= $UserConfigs/UserDecorations.conf # Decorations config file
 
-- 
cgit v1.2.3


From 5fc91179274f7dceed62e24aad274a600d082f22 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 02:25:14 -0500
Subject: fix(copy): always add KeybindsLayoutInit.sh to
 UserConfigs/Startup_Apps overlay\n\n- Ensures the layout-aware J/K init
 survives composition and user updates\n- Prevents cases where
 generated/Startup_Apps.conf misses the init entry

---
 copy.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/copy.sh b/copy.sh
index b4e958a9..1addda84 100755
--- a/copy.sh
+++ b/copy.sh
@@ -281,6 +281,14 @@ if command -v qs >/dev/null 2>&1; then
   sed -i '/#pkill qs && qs &/s/^#//' config/hypr/scripts/Refresh.sh
 fi
 
+# 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
 
-- 
cgit v1.2.3


From a35eb612dda901c5d14d559e55e64c0b1e93eae4 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 02:32:31 -0500
Subject: fix(startup): preserve KeybindsLayoutInit in composed Startup_Apps;
 harden hyprlock 12h edits\n\n- ComposeHyprConfigs.sh: ignore disabling
 /KeybindsLayoutInit.sh\n- copy.sh migration: filter KeybindsLayoutInit from
 Startup_Apps.disable\n- copy.sh: target existing hyprlock template, avoid sed
 errors

---
 config/hypr/scripts/ComposeHyprConfigs.sh |  4 ++++
 copy.sh                                   | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/config/hypr/scripts/ComposeHyprConfigs.sh b/config/hypr/scripts/ComposeHyprConfigs.sh
index 55bc3c5c..f0928a24 100755
--- a/config/hypr/scripts/ComposeHyprConfigs.sh
+++ b/config/hypr/scripts/ComposeHyprConfigs.sh
@@ -58,6 +58,10 @@ compose_startup_apps() {
     while IFS= read -r d; do
       d="$(echo "$d" | trim)"
       [[ -z "$d" || "$d" =~ ^# ]] && continue
+      # Never disable our layout-aware keybind init unless user re-enables via explicit edit here
+      if [[ "$d" == "\$scriptsDir/KeybindsLayoutInit.sh" ]]; then
+        continue
+      fi
       unset 'cmds[$d]'
     done <"$disable_file"
   fi
diff --git a/copy.sh b/copy.sh
index 1addda84..cd5f5212 100755
--- a/copy.sh
+++ b/copy.sh
@@ -414,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"
 
@@ -854,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
-- 
cgit v1.2.3


From 67cc7cdab26ad7dc0f9c0aa691a1efc3a200518a Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 02:45:53 -0500
Subject: fix(qs): Edit Startup Apps opens full vendor defaults
 (configs/Startup_Apps.conf)\n\n- Restores prior behavior where users edit the
 complete startup config\n- Composition still merges overlay+vendor at runtime

---
 config/hypr/scripts/Kool_Quick_Settings.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/hypr/scripts/Kool_Quick_Settings.sh b/config/hypr/scripts/Kool_Quick_Settings.sh
index 79ddc163..d6e1b089 100755
--- a/config/hypr/scripts/Kool_Quick_Settings.sh
+++ b/config/hypr/scripts/Kool_Quick_Settings.sh
@@ -58,7 +58,7 @@ main() {
         "view/edit Window Rules") file="$UserConfigs/WindowRules.conf" ;;
         "view/edit User Keybinds") file="$UserConfigs/UserKeybinds.conf" ;;
         "view/edit User Settings") file="$UserConfigs/UserSettings.conf" ;;
-        "view/edit Startup Apps") file="$UserConfigs/Startup_Apps.conf" ;;
+        "view/edit Startup Apps") file="$configs/Startup_Apps.conf" ;;
         "view/edit Decorations") file="$UserConfigs/UserDecorations.conf" ;;
         "view/edit Animations") file="$UserConfigs/UserAnimations.conf" ;;
         "view/edit Laptop Keybinds") file="$UserConfigs/Laptops.conf" ;;
-- 
cgit v1.2.3


From 109a4b1ab03ef16b20c00aeb2775f515fc56ff07 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 02:50:39 -0500
Subject: fix(hypr): source UserConfigs/Startup_Apps.conf and WindowRules.conf
 again\n\n- Revert to runtime includes that always exist to restore startup
 apps\n- Keep KeybindsLayoutInit in vendor configs/Startup_Apps.conf so it
 runs

---
 config/hypr/hyprland.conf | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 1cf7bd31..fa8435dc 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -9,15 +9,13 @@ exec-once = $HOME/.config/hypr/initial-boot.sh
 
 # Sourcing external config files
 $configs = $HOME/.config/hypr/configs # Default Configs directory path
-$Generated = $HOME/.config/hypr/generated # Composed configs (base + user overlays)
 
 source=$configs/Keybinds.conf # Pre-configured keybinds
 
 # ## This is where you want to start tinkering 
 $UserConfigs = $HOME/.config/hypr/UserConfigs # User Configs directory path
 
-# Use composed Startup_Apps (base + user overlay + disables)
-source= $Generated/Startup_Apps.conf
+source= $UserConfigs/Startup_Apps.conf
 
 source= $UserConfigs/ENVariables.conf # Environment variables to load
 
@@ -28,8 +26,7 @@ source= $UserConfigs/Laptops.conf # For laptop related
 
 source= $UserConfigs/LaptopDisplay.conf # Laptop display related. You need to read the comment on this file
 
-# Use composed WindowRules (base + user overlay + disables)
-source= $Generated/WindowRules.conf # all about Hyprland Window Rules and Layer Rules
+source= $UserConfigs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules
 
 source= $UserConfigs/UserDecorations.conf # Decorations config file
 
-- 
cgit v1.2.3


From f8e7eb13f48aa5576674318bcd7b3ab920e72846 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 02:53:52 -0500
Subject: fix(startup): load vendor Startup_Apps/WindowRules then user
 overlay\n\n- Restores baseline autostarts (waybar, swaync, etc.) while
 allowing user additions\n- Keeps SUPER+SHIFT+E editing vendor Startup_Apps
 for full view

---
 config/hypr/hyprland.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index fa8435dc..8f0fc1e5 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -15,6 +15,8 @@ source=$configs/Keybinds.conf # Pre-configured keybinds
 # ## This is where you want to start tinkering 
 $UserConfigs = $HOME/.config/hypr/UserConfigs # User Configs directory path
 
+# Load vendor defaults, then user additions/overrides
+source= $configs/Startup_Apps.conf
 source= $UserConfigs/Startup_Apps.conf
 
 source= $UserConfigs/ENVariables.conf # Environment variables to load
@@ -26,7 +28,9 @@ 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
+# Load vendor defaults, then user additions
+source= $configs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules (defaults)
+source= $UserConfigs/WindowRules.conf # user rules and layer rules
 
 source= $UserConfigs/UserDecorations.conf # Decorations config file
 
-- 
cgit v1.2.3


From 8361dcc058fb41225630934d37bae65dd9b76e43 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 03:05:23 -0500
Subject: chore(release): v2.3.18\n\nKeybinds\n- Initialize SUPER+J/K to match
 default layout at login via scripts/KeybindsLayoutInit.sh\n- Keep
 ChangeLayout.sh dynamic rebinds on layout toggle\n- Credit: Suresh Thagunna
 (https://github.com/suresh466)\n\nStartup\n- Source vendor
 Startup_Apps/WindowRules first, then UserConfigs overlay to restore baseline
 autostarts while honoring user additions\n- Quick Settings: Edit Startup Apps
 opens full vendor defaults\n\nMeta\n- Version marker: config/hypr/v2.3.18

---
 CHANGELOG.md                             | 9 +++++++++
 config/hypr/UserConfigs/ENVariables.conf | 2 +-
 config/hypr/v2.3.17                      | 5 -----
 config/hypr/v2.3.18                      | 5 +++++
 4 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 config/hypr/v2.3.17
 create mode 100644 config/hypr/v2.3.18

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd01997b..f6623708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog — JAK's Hyprland Dotfiles
 
+## v2.3.18 — 2025-11-05
+
+- Keybinds: initialize SUPER+J/K at login to match the default layout (master or dwindle).
+  - Adds scripts/KeybindsLayoutInit.sh and wires it to Startup_Apps so J/K and O (togglesplit) are correct on first session.
+  - ChangeLayout.sh continues to rebind dynamically when layouts are toggled.
+  - Credits: [Suresh Thagunna](https://github.com/suresh466) for identifying the mismatch and proposing an auto-alignment approach.
+- Startup config sourcing: load vendor Startup_Apps and WindowRules first, then user overlays, restoring baseline autostarts while keeping user additions.
+- Quick Settings: “Edit Startup Apps” opens the full vendor defaults for clarity.
+
 ## October 2025
 
 ### ⌨️ Keybinds
diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index d82fc2a6..4e736dc3 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -5,7 +5,7 @@
 
 # environment-variables
 # Current Version of JakooLit Dotfiles:
-env = DOTS_VERSION,2.3.17
+env = DOTS_VERSION,2.3.18
 
 # Toolkit Backend Variables
 env = GDK_BACKEND,wayland,x11,*
diff --git a/config/hypr/v2.3.17 b/config/hypr/v2.3.17
deleted file mode 100644
index 31b3414d..00000000
--- a/config/hypr/v2.3.17
+++ /dev/null
@@ -1,5 +0,0 @@
-### https://github.com/JaKooLit ###
-## https://github.com/JaKooLit/Hyprland-Dots
-## This is to have a reference of which version would be
-
-## note that this will always be higher than the released versions
\ No newline at end of file
diff --git a/config/hypr/v2.3.18 b/config/hypr/v2.3.18
new file mode 100644
index 00000000..31b3414d
--- /dev/null
+++ b/config/hypr/v2.3.18
@@ -0,0 +1,5 @@
+### https://github.com/JaKooLit ###
+## https://github.com/JaKooLit/Hyprland-Dots
+## This is to have a reference of which version would be
+
+## note that this will always be higher than the released versions
\ No newline at end of file
-- 
cgit v1.2.3


From 74b5fe09f3a0b04093ff1442b1dfc683f40d3eca Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 21:59:55 -0500
Subject: Dropped duplicate startup_apps.sh script

Removed the ComposeHyprConfitg.sh script

 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	deleted:    config/hypr/UserConfigs/Startup_Apps.conf
	modified:   config/hypr/hyprland.conf
	deleted:    config/hypr/scripts/ComposeHyprConfigs.sh
	modified:   config/hypr/scripts/Kool_Quick_Settings.sh
	modified:   copy.sh
  modified:   upgrade.sh
---
 config/hypr/UserConfigs/Startup_Apps.conf  |  62 ----------------
 config/hypr/hyprland.conf                  |   2 -
 config/hypr/scripts/ComposeHyprConfigs.sh  | 113 -----------------------------
 config/hypr/scripts/Kool_Quick_Settings.sh |   2 +-
 copy.sh                                    |   4 -
 upgrade.sh                                 |   4 -
 6 files changed, 1 insertion(+), 186 deletions(-)
 delete mode 100644 config/hypr/UserConfigs/Startup_Apps.conf
 delete mode 100755 config/hypr/scripts/ComposeHyprConfigs.sh

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
deleted file mode 100644
index 4f4fbd22..00000000
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Commands and Apps to be executed at launch
-
-$scriptsDir = $HOME/.config/hypr/scripts
-$UserScripts = $HOME/.config/hypr/UserScripts
-
-$wallDIR=$HOME/Pictures/wallpapers
-$lock = $scriptsDir/LockScreen.sh
-$SwwwRandom = $UserScripts/WallpaperAutoChange.sh
-$livewallpaper=""
-
-# wallpaper stuff 
-exec-once = swww-daemon --format argb   # New flag for v0.11.2 
-#exec-once = swww-daemon --format xrgb  # old 0.9.5 option
-#exec-once = mpvpaper '*' -o "load-scripts=no no-audio --loop" $livewallpaper
-
-# wallpaper random
-#exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes
-
-# Startup
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-
-# Initialize Drop Down terminal - See Bug#810 https://github.com/JaKooLit/Hyprland-Dots/issues/810#issuecomment-3351947644
-exec-once = $HOME/.config/hypr/scripts/Dropterminal.sh kitty &
-
-
-# Polkit (Polkit Gnome / KDE)
-exec-once = $scriptsDir/Polkit.sh
-
-# starup apps
-exec-once = nm-applet --indicator
-exec-once = nm-tray   # For ubuntu
-exec-once = swaync
-#exec-once = ags
-#exec-once = blueman-applet
-#exec-once = rog-control-center
-exec-once = waybar
-exec-once = qs # quickshell AGS Desktop Overview alternative
-
-#clipboard manager
-exec-once = wl-paste --type text --watch cliphist store
-exec-once = wl-paste --type image --watch cliphist store
-
-# Rainbow borders
-exec-once = $UserScripts/RainbowBorders.sh
-
-# Starting hypridle to start hyprlock
-exec-once = hypridle
-
-# Weather script to populate cache on startup
-exec-once = $UserScripts/WeatherWrap.sh
-
-
-# Here are list of features available but disabled by default
-# exec-once = swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
-
-#gnome polkit for nixos
-#exec-once = $scriptsDir/Polkit-NixOS.sh
-
-# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start)
-#exec-once = $scriptsDir/PortalHyprland.sh
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 8f0fc1e5..8eb91df7 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -17,7 +17,6 @@ $UserConfigs = $HOME/.config/hypr/UserConfigs # User Configs directory path
 
 # Load vendor defaults, then user additions/overrides
 source= $configs/Startup_Apps.conf
-source= $UserConfigs/Startup_Apps.conf
 
 source= $UserConfigs/ENVariables.conf # Environment variables to load
 
@@ -30,7 +29,6 @@ source= $UserConfigs/LaptopDisplay.conf # Laptop display related. You need to re
 
 # Load vendor defaults, then user additions
 source= $configs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules (defaults)
-source= $UserConfigs/WindowRules.conf # user rules and layer rules
 
 source= $UserConfigs/UserDecorations.conf # Decorations config file
 
diff --git a/config/hypr/scripts/ComposeHyprConfigs.sh b/config/hypr/scripts/ComposeHyprConfigs.sh
deleted file mode 100755
index f0928a24..00000000
--- a/config/hypr/scripts/ComposeHyprConfigs.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-# Compose merged Hyprland configs for Startup_Apps and WindowRules
-set -euo pipefail
-
-BASE_DIR="$HOME/.config/hypr"
-BASE_CFG_DIR="$BASE_DIR/configs"
-USER_DIR="$BASE_DIR/UserConfigs"
-GEN_DIR="$BASE_DIR/generated"
-
-mkdir -p "$GEN_DIR"
-
-log() { printf "[compose] %s\n" "$*"; }
-
-# Trim leading/trailing whitespace
-trim() { sed -E 's/^\s+//;s/\s+$//'; }
-
-# Normalize spaces in a directive line
-normalize() { awk '{$1=$1;print}'; }
-
-# Build merged Startup_Apps.conf
-compose_startup_apps() {
-  local base_file="$BASE_CFG_DIR/Startup_Apps.conf"
-  local user_file="$USER_DIR/Startup_Apps.conf"
-  local disable_file="$USER_DIR/Startup_Apps.disable"
-  local out_file="$GEN_DIR/Startup_Apps.conf"
-
-  : >"$out_file"
-
-  # Header and variable lines come from base
-  if [[ -f "$base_file" ]]; then
-    # Copy all non exec-once lines (comments, blanks, variables, etc.)
-    grep -Ev '^\s*exec-once\s*=' "$base_file" || true >>"$out_file"
-  fi
-
-  # Collect exec-once commands (the right side of '=')
-  declare -A cmds=()
-
-  if [[ -f "$base_file" ]]; then
-    while IFS= read -r line; do
-      [[ "$line" =~ ^\s*exec-once\s*= ]] || continue
-      cmd="${line#*=}"
-      cmd="$(echo "$cmd" | trim)"
-      cmds["$cmd"]=1
-    done <"$base_file"
-  fi
-
-  if [[ -f "$user_file" ]]; then
-    while IFS= read -r line; do
-      [[ "$line" =~ ^\s*exec-once\s*= ]] || continue
-      cmd="${line#*=}"
-      cmd="$(echo "$cmd" | trim)"
-      cmds["$cmd"]=1
-    done <"$user_file"
-  fi
-
-  # Apply disables (exact match of command string)
-  if [[ -f "$disable_file" ]]; then
-    while IFS= read -r d; do
-      d="$(echo "$d" | trim)"
-      [[ -z "$d" || "$d" =~ ^# ]] && continue
-      # Never disable our layout-aware keybind init unless user re-enables via explicit edit here
-      if [[ "$d" == "\$scriptsDir/KeybindsLayoutInit.sh" ]]; then
-        continue
-      fi
-      unset 'cmds[$d]'
-    done <"$disable_file"
-  fi
-
-  # Emit combined exec-once (stable sort)
-  for k in "${!cmds[@]}"; do echo "$k"; done | sort -u | while IFS= read -r cmd; do
-    [[ -z "$cmd" ]] && continue
-    printf "exec-once = %s\n" "$cmd" >>"$out_file"
-  done
-
-  log "Wrote $out_file"
-}
-
-# Build merged WindowRules.conf
-compose_window_rules() {
-  local base_file="$BASE_CFG_DIR/WindowRules.conf"
-  local user_file="$USER_DIR/WindowRules.conf"
-  local disable_file="$USER_DIR/WindowRules.disable"
-  local out_file="$GEN_DIR/WindowRules.conf"
-
-  : >"$out_file"
-  echo "# Generated merged WindowRules" >>"$out_file"
-
-  declare -A rules=()
-  add_rules() {
-    local f="$1"
-    [[ -f "$f" ]] || return 0
-    grep -E '^(windowrule|layerrule)\s*=' "$f" | trim | while IFS= read -r r; do
-      rules["$r"]=1
-    done
-  }
-
-  add_rules "$base_file"
-  add_rules "$user_file"
-
-  if [[ -f "$disable_file" ]]; then
-    while IFS= read -r d; do
-      d="$(echo "$d" | trim)"
-      [[ -z "$d" || "$d" =~ ^# ]] && continue
-      unset 'rules[$d]'
-    done <"$disable_file"
-  fi
-
-  for r in "${!rules[@]}"; do echo "$r"; done | sort -u >>"$out_file"
-  log "Wrote $out_file"
-}
-
-compose_startup_apps
-compose_window_rules
\ No newline at end of file
diff --git a/config/hypr/scripts/Kool_Quick_Settings.sh b/config/hypr/scripts/Kool_Quick_Settings.sh
index d6e1b089..16742492 100755
--- a/config/hypr/scripts/Kool_Quick_Settings.sh
+++ b/config/hypr/scripts/Kool_Quick_Settings.sh
@@ -55,7 +55,7 @@ main() {
     case "$choice" in
     	"view/edit User Defaults") file="$UserConfigs/01-UserDefaults.conf" ;;
         "view/edit ENV variables") file="$UserConfigs/ENVariables.conf" ;;
-        "view/edit Window Rules") file="$UserConfigs/WindowRules.conf" ;;
+        "view/edit Window Rules") file="$configs/WindowRules.conf" ;;
         "view/edit User Keybinds") file="$UserConfigs/UserKeybinds.conf" ;;
         "view/edit User Settings") file="$UserConfigs/UserSettings.conf" ;;
         "view/edit Startup Apps") file="$configs/Startup_Apps.conf" ;;
diff --git a/copy.sh b/copy.sh
index cd5f5212..b1cc6e1a 100755
--- a/copy.sh
+++ b/copy.sh
@@ -933,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}
 
diff --git a/upgrade.sh b/upgrade.sh
index 9aee3c2c..07ee1f8b 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -198,10 +198,6 @@ if version_gt "$latest_version" "$stored_version"; then
         # Set executable for initial-boot.sh
         chmod +x "$HOME/.config/hypr/initial-boot.sh" 2>&1 | tee -a "$LOG"
         
-        # Compose merged configs (Startup_Apps and WindowRules)
-        if [ -x "$HOME/.config/hypr/scripts/ComposeHyprConfigs.sh" ]; then
-          "$HOME/.config/hypr/scripts/ComposeHyprConfigs.sh" 2>&1 | tee -a "$LOG" || true
-        fi		
     else
         echo "$MAGENTA Upgrade declined. No files or directories changed" 2>&1 | tee -a "$LOG"
     fi
-- 
cgit v1.2.3


From 206f51d28f8f0cb17289c573991eea5eedae2eec Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Wed, 5 Nov 2025 22:07:57 -0500
Subject: Fixing layout aware SUPER J/K cycle next/prev

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   config/hypr/configs/Keybinds.conf
	modified:   config/hypr/scripts/KeybindsLayoutInit.sh
---
 config/hypr/configs/Keybinds.conf         | 6 ++++--
 config/hypr/scripts/KeybindsLayoutInit.sh | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index ebaee30a..fbe3bfe5 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -19,8 +19,10 @@ bindd = $mainMod SHIFT, E, Quick settings menu, exec, $scriptsDir/Kool_Quick_Set
 # Master Layout
 bindd = $mainMod CTRL, D, remove master, layoutmsg, removemaster
 bindd = $mainMod, I, add master, layoutmsg, addmaster
-bindd = $mainMod, J, cycle next, layoutmsg, cyclenext
-bindd = $mainMod, K, cycle previous, layoutmsg, cycleprev
+# NOTE: J/K bindings are set dynamically by scripts/KeybindsLayoutInit.sh and scripts/ChangeLayout.sh
+# (we intentionally do not bind them statically here to avoid conflicts across layouts)
+# bindd = $mainMod, J, cycle next, layoutmsg, cyclenext
+# bindd = $mainMod, K, cycle previous, layoutmsg, cycleprev
 bindd = $mainMod CTRL, Return, swap with master, layoutmsg, swapwithmaster
 
 # Dwindle Layout
diff --git a/config/hypr/scripts/KeybindsLayoutInit.sh b/config/hypr/scripts/KeybindsLayoutInit.sh
index 7e328cde..af81f62e 100755
--- a/config/hypr/scripts/KeybindsLayoutInit.sh
+++ b/config/hypr/scripts/KeybindsLayoutInit.sh
@@ -20,7 +20,8 @@ case "$LAYOUT" in
     hyprctl keyword unbind SUPER,K
     hyprctl keyword unbind SUPER,O
     hyprctl keyword bind SUPER,J,cyclenext
-    hyprctl keyword bind SUPER,K,cyclenext,prev
+hyprctl keyword bind SUPER,K,cyclenext,prev
+# ensure SUPER+O togglesplit is available on dwindle
     hyprctl keyword bind SUPER,O,togglesplit
     ;;
   *)
-- 
cgit v1.2.3


From 1788691d242abe607add69d211478e306a154cc6 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Fri, 7 Nov 2025 12:26:05 -0500
Subject: Fixing Super J/K cycle next/prev for auto layout

 Cycle next/prev is different for dwindle vs. master
 Oringinal code only worked in master. This script detects which and
 rebunds SUPER J/K accordingly

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   config/hypr/scripts/KeybindsLayoutInit.sh
---
 config/hypr/scripts/KeybindsLayoutInit.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/config/hypr/scripts/KeybindsLayoutInit.sh b/config/hypr/scripts/KeybindsLayoutInit.sh
index af81f62e..fd34f90e 100755
--- a/config/hypr/scripts/KeybindsLayoutInit.sh
+++ b/config/hypr/scripts/KeybindsLayoutInit.sh
@@ -2,8 +2,15 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Initialize J/K keybinds to match the current default layout at startup
 
-# Query current layout (master|dwindle)
-LAYOUT=$(hyprctl -j getoption general:layout | jq -r '.str')
+set -euo pipefail
+
+# Determine current layout (master|dwindle); be robust to null at startup
+LAYOUT=$(hyprctl -j getoption general:layout | jq -r '.str // empty' 2>/dev/null || true)
+if [ -z "${LAYOUT:-}" ]; then
+  # Fallback: parse non-JSON output (e.g., "str: dwindle")
+  LAYOUT=$(hyprctl getoption general:layout 2>/dev/null | awk -F'str:' 'NF>1 {gsub(/^ +| +$/,"",$2); print $2}')
+fi
+[ -z "${LAYOUT:-}" ] && exit 0
 
 case "$LAYOUT" in
   master)
@@ -20,8 +27,8 @@ case "$LAYOUT" in
     hyprctl keyword unbind SUPER,K
     hyprctl keyword unbind SUPER,O
     hyprctl keyword bind SUPER,J,cyclenext
-hyprctl keyword bind SUPER,K,cyclenext,prev
-# ensure SUPER+O togglesplit is available on dwindle
+    hyprctl keyword bind SUPER,K,cyclenext,prev
+    # ensure SUPER+O togglesplit is available on dwindle
     hyprctl keyword bind SUPER,O,togglesplit
     ;;
   *)
-- 
cgit v1.2.3


From 672aaf336df2a4897c086d84da6fea8611a5ec54 Mon Sep 17 00:00:00 2001
From: Alberson Miranda <45690517+albersonmiranda@users.noreply.github.com>
Date: Sat, 8 Nov 2025 00:17:21 -0300
Subject: feat: resume hyprsunset (#862)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Looks good! Merging this into development branch 👍
---
 config/hypr/configs/Startup_Apps.conf |  2 ++
 config/hypr/scripts/Hyprsunset.sh     | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/config/hypr/configs/Startup_Apps.conf b/config/hypr/configs/Startup_Apps.conf
index 07a92a3f..c1670595 100644
--- a/config/hypr/configs/Startup_Apps.conf
+++ b/config/hypr/configs/Startup_Apps.conf
@@ -48,6 +48,8 @@ exec-once = $UserScripts/RainbowBorders.sh
 # Starting hypridle to start hyprlock
 exec-once = hypridle
 
+# Resume Hyprsunset if state is "on" from previous session
+exec-once = $scriptsDir/Hyprsunset.sh init
 
 # Here are list of features available but disabled by default
 # exec-once = swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
diff --git a/config/hypr/scripts/Hyprsunset.sh b/config/hypr/scripts/Hyprsunset.sh
index c7c4b395..4a2b52f4 100755
--- a/config/hypr/scripts/Hyprsunset.sh
+++ b/config/hypr/scripts/Hyprsunset.sh
@@ -8,12 +8,12 @@ set -euo pipefail
 # - On: sunset icon if available, otherwise a blue sun
 #
 # Customize via env vars:
-#   HYPERSUNSET_TEMP   default 4500 (K)
-#   HYPERSUNSET_ICON_MODE  sunset|blue  (default: sunset)
+#   HYPRSUNSET_TEMP   default 4500 (K)
+#   HYPRSUNSET_ICON_MODE  sunset|blue  (default: sunset)
 
 STATE_FILE="$HOME/.cache/.hyprsunset_state"
-TARGET_TEMP="${HYPERSUNSET_TEMP:-4500}"
-ICON_MODE="${HYPERSUNSET_ICON_MODE:-sunset}"
+TARGET_TEMP="${HYPRSUNSET_TEMP:-4500}"
+ICON_MODE="${HYPRSUNSET_ICON_MODE:-sunset}"
 
 ensure_state() {
   [[ -f "$STATE_FILE" ]] || echo "off" > "$STATE_FILE"
@@ -92,8 +92,20 @@ cmd_status() {
   printf '{"text":"%s","class":"%s","tooltip":"%s"}\n' "$txt" "$cls" "$tip"
 }
 
+cmd_init() {
+  ensure_state
+  state="$(cat "$STATE_FILE" || echo off)"
+
+  if [[ "$state" == "on" ]]; then
+    if command -v hyprsunset >/dev/null 2>&1; then
+      nohup hyprsunset -t "$TARGET_TEMP" >/dev/null 2>&1 &
+    fi
+  fi
+}
+
 case "${1:-}" in
   toggle) cmd_toggle ;;
   status) cmd_status ;;
-  *) echo "usage: $0 [toggle|status]" >&2; exit 2 ;;
+  init) cmd_init ;;
+  *) echo "usage: $0 [toggle|status|init]" >&2; exit 2 ;;
  esac
-- 
cgit v1.2.3


From 0cda1d47c8ff9344ea62bc3741911b3da9367f86 Mon Sep 17 00:00:00 2001
From: brockar <martinnguzman.mg@gmail.com>
Date: Sun, 9 Nov 2025 10:05:45 -0300
Subject: fix: Weather.py one-off run

---
 config/hypr/UserScripts/Weather.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index a9a826e1..a6483777 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -44,7 +44,7 @@ class WeatherData:
 # Examples (zsh):
 #   # One-off run
 #   # WEATHER_UNITS can be "metric" or "imperial"
-#   WEATHER_UNITS=imperial WEATHER_PLACE="Concord, NH" python3 /home/dwilliams/Projects/Weather.py
+#   WEATHER_UNITS=imperial WEATHER_PLACE="Concord, NH" python3 ~/.config/hypr/UserScripts/Weather.py
 #
 #   # Persist in current shell session
 #   export WEATHER_UNITS=imperial
-- 
cgit v1.2.3


From e90d57835b9596c83dec0e468e666af4c209a63a Mon Sep 17 00:00:00 2001
From: brockar <martinnguzman.mg@gmail.com>
Date: Wed, 12 Nov 2025 22:53:59 -0300
Subject: fix: add UserConfigs/Startup_App.conf to hyprland.conf and clean a
 bit

---
 config/hypr/hyprland.conf | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 8eb91df7..a85c235f 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -9,35 +9,27 @@ 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=$configs/Keybinds.conf # Pre-configured keybinds
+
 # Load vendor defaults, then user additions/overrides
 source= $configs/Startup_Apps.conf
+source= $UserConfigs/Startup_Apps.conf
 
 source= $UserConfigs/ENVariables.conf # Environment variables to load
 
-#source= $UserConfigs/Monitors.conf # Its all about your monitor config (old dots) will remove on push to main
-#source= $UserConfigs/WorkspaceRules.conf # Hyprland workspaces (old dots) will remove on push to main
-
 source= $UserConfigs/Laptops.conf # For laptop related
-
 source= $UserConfigs/LaptopDisplay.conf # Laptop display related. You need to read the comment on this file
 
 # Load vendor defaults, then user additions
 source= $configs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules (defaults)
 
 source= $UserConfigs/UserDecorations.conf # Decorations config file
-
 source= $UserConfigs/UserAnimations.conf # Animation config file
-
 source= $UserConfigs/UserKeybinds.conf # Put your own keybinds here
-
 source= $UserConfigs/UserSettings.conf # Main Hyprland Settings.
-
 source= $UserConfigs/01-UserDefaults.conf # settings for User defaults apps
 
 # nwg-displays
-- 
cgit v1.2.3


From 4693e56583f81e10de500ad701ba57175113e969 Mon Sep 17 00:00:00 2001
From: brockar <martinnguzman.mg@gmail.com>
Date: Wed, 12 Nov 2025 23:04:02 -0300
Subject: fix: hyprland.conf user windowrules

---
 config/hypr/hyprland.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index a85c235f..f509a76d 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -25,6 +25,7 @@ source= $UserConfigs/LaptopDisplay.conf # Laptop display related. You need to re
 
 # Load vendor defaults, then user additions
 source= $configs/WindowRules.conf # all about Hyprland Window Rules and Layer Rules (defaults)
+source= $UserConfigs/WindowRules.conf # Window Rules and Layer Rules user configs
 
 source= $UserConfigs/UserDecorations.conf # Decorations config file
 source= $UserConfigs/UserAnimations.conf # Animation config file
-- 
cgit v1.2.3


From ad3b7656f223f380e3f60cf77bb125a09ab28559 Mon Sep 17 00:00:00 2001
From: installer <installer@gmail.com>
Date: Thu, 13 Nov 2025 12:47:11 -0500
Subject: Upd std resolution lockscreen to horizontal layout

Reduced the font size and colors
Going to convert the 2k lockscreen next

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   config/hypr/hyprlock.conf
---
 config/hypr/hyprlock.conf | 99 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index b67bba51..4251ac68 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -1,5 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Hyprlock config for => 2k monitor resolutions                                                         
+# Hyprlock config for < 1080p monitor resolutions                                                         
 # Original config submitted by https://github.com/SherLock707
 
 # Sourcing colors generated by wallust
@@ -37,9 +37,9 @@ label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
     color = $color13
-    font_size = 18
+    font_size = 48 
     font_family = Victor Mono Bold Italic
-    position = 0, -120
+    position = 0, -60
     halign = center
     valign = center
 }
@@ -47,66 +47,66 @@ label {
 # Hour-Time
 label {
     monitor =
-    text = cmd[update:1000] echo "$(date +"%H")"
-#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
+#     text = cmd[update:1000] echo "$(date +"%H")"
+    text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM
 	#color = rgba(255, 185, 0, .8)
-    color = $color13
-    font_size = 240
+    color = $color8
+    font_size = 130
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -100
+    position = 0, -250
     halign = center
     valign = top
 }
 
 # Minute-Time
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%M")"
-    #color = rgba(15, 10, 222, .8)
-    color = $color12
-    font_size = 240
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -450
-    halign = center
-    valign = top
-}
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(date +"%M")"
+#     #color = rgba(15, 10, 222, .8)
+#     color = $color12
+#     font_size = 150
+#     font_family = JetBrainsMono Nerd Font ExtraBold
+#     position = 0, -340
+#     halign = center
+ #    valign = top
+# }
 
 # Seconds-Time
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%S")"
+#label {
+#    monitor =
+##     text = cmd[update:1000] echo "$(date +"%S")"
 #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-    color = $color11
-    font_size = 50
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -450
-    halign = center
-    valign = top
-}
+#    color = $color11
+#    font_size = 32
+#    font_family = JetBrainsMono Nerd Font ExtraBold
+#    position = 0, -350
+#    halign = center
+#    valign = top
+#}
 
 # Put a picture of choice here. Default is the current wallpaper
 #image {
 #    monitor =
-#    #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
+#    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
 #    size = 160
 #    rounding = -1
 #    border_size = 0
 #    border_color = $color11
 #    rotate = 0
 #    reload_time = -1
-#    position = 0, 400
+#    position = 0, 280
 #    halign = center
 #    valign = bottom
-#}
+}
 
 # USER
 label {
     monitor =
     text =   $USER
-    color = $color13
-    font_size = 24
+    color = $color9
+    font_size = 36
     font_family = Victor Mono Bold Oblique
-    position = 0, 280
+    position = 0, 275
     halign = center
     valign = bottom
 }
@@ -114,33 +114,32 @@ label {
 # INPUT FIELD
 input-field {
     monitor =
-    size = 300, 60
+    size = 230, 70
     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
     dots_center = true
-    outer_color = $color11
+    outer_color = $color8
     inner_color = rgba(255, 255, 255, 0.1)
+	capslock_color = rgb(255,255,255)
     font_color = $color13
-    capslock_color = rgb(255,255,255)
     fade_on_empty = false
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 120
+    position = 0, 100
     halign = center
     valign = bottom
 }
 
-
 # Keyboard LAYOUT
 label {
     monitor =
     text = $LAYOUT
-    color = $color13
-    font_size = 12
+    color = $color8
+    font_size = 14
     font_family = Victor Mono Bold Oblique
-    position = 0, 80
+    position = 0, 70
     halign = center
     valign = bottom
 }
@@ -149,8 +148,8 @@ label {
 label {
     monitor =
     text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
-    color = $color13
-    font_size = 18
+    color = $color8
+    font_size = 24
     font_family = Victor Mono Bold Oblique
     position = 0, 0
     halign = right
@@ -161,8 +160,8 @@ label {
 label {
     monitor =
     text = cmd[update:1000] echo "<b> "$($Scripts/Battery.sh)" </b>"
-    color = $color13
-    font_size = 18
+    color = $color8
+    font_size = 16
     font_family = Victor Mono Bold Oblique
     position = 0, 30
     halign = right
@@ -174,9 +173,9 @@ label {
 # see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock
 label {
     monitor =
-    text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat  "$HOME/.cache/.weather_cache"
-    color = $color13
-    font_size = 18
+    text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache"
+    color = $color8
+    font_size = 14
     font_family = Victor Mono Bold Oblique
     position = 50, 0
     halign = left
-- 
cgit v1.2.3


From 6bb250c58fbdda05140f5e197c25106d3ba27c57 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Thu, 13 Nov 2025 13:02:34 -0500
Subject: Reverting 2K hyprlock to original

Editing 1080 hyprlock screen overwrote 2K by mistake

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   hyprlock.conf
---
 config/hypr/hyprlock.conf | 99 ++++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 4251ac68..b67bba51 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -1,5 +1,5 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Hyprlock config for < 1080p monitor resolutions                                                         
+# Hyprlock config for => 2k monitor resolutions                                                         
 # Original config submitted by https://github.com/SherLock707
 
 # Sourcing colors generated by wallust
@@ -37,9 +37,9 @@ label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
     color = $color13
-    font_size = 48 
+    font_size = 18
     font_family = Victor Mono Bold Italic
-    position = 0, -60
+    position = 0, -120
     halign = center
     valign = center
 }
@@ -47,66 +47,66 @@ label {
 # Hour-Time
 label {
     monitor =
-#     text = cmd[update:1000] echo "$(date +"%H")"
-    text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM
+    text = cmd[update:1000] echo "$(date +"%H")"
+#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
 	#color = rgba(255, 185, 0, .8)
-    color = $color8
-    font_size = 130
+    color = $color13
+    font_size = 240
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -250
+    position = 0, -100
     halign = center
     valign = top
 }
 
 # Minute-Time
-# label {
-#     monitor =
-#     text = cmd[update:1000] echo "$(date +"%M")"
-#     #color = rgba(15, 10, 222, .8)
-#     color = $color12
-#     font_size = 150
-#     font_family = JetBrainsMono Nerd Font ExtraBold
-#     position = 0, -340
-#     halign = center
- #    valign = top
-# }
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%M")"
+    #color = rgba(15, 10, 222, .8)
+    color = $color12
+    font_size = 240
+    font_family = JetBrainsMono Nerd Font ExtraBold
+    position = 0, -450
+    halign = center
+    valign = top
+}
 
 # Seconds-Time
-#label {
-#    monitor =
-##     text = cmd[update:1000] echo "$(date +"%S")"
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%S")"
 #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-#    color = $color11
-#    font_size = 32
-#    font_family = JetBrainsMono Nerd Font ExtraBold
-#    position = 0, -350
-#    halign = center
-#    valign = top
-#}
+    color = $color11
+    font_size = 50
+    font_family = JetBrainsMono Nerd Font ExtraBold
+    position = 0, -450
+    halign = center
+    valign = top
+}
 
 # Put a picture of choice here. Default is the current wallpaper
 #image {
 #    monitor =
-#    path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
+#    #path = $HOME/.config/hypr/wallpaper_effects/.wallpaper_current
 #    size = 160
 #    rounding = -1
 #    border_size = 0
 #    border_color = $color11
 #    rotate = 0
 #    reload_time = -1
-#    position = 0, 280
+#    position = 0, 400
 #    halign = center
 #    valign = bottom
-}
+#}
 
 # USER
 label {
     monitor =
     text =   $USER
-    color = $color9
-    font_size = 36
+    color = $color13
+    font_size = 24
     font_family = Victor Mono Bold Oblique
-    position = 0, 275
+    position = 0, 280
     halign = center
     valign = bottom
 }
@@ -114,32 +114,33 @@ label {
 # INPUT FIELD
 input-field {
     monitor =
-    size = 230, 70
+    size = 300, 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
     dots_center = true
-    outer_color = $color8
+    outer_color = $color11
     inner_color = rgba(255, 255, 255, 0.1)
-	capslock_color = rgb(255,255,255)
     font_color = $color13
+    capslock_color = rgb(255,255,255)
     fade_on_empty = false
     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 = $color8
-    font_size = 14
+    color = $color13
+    font_size = 12
     font_family = Victor Mono Bold Oblique
-    position = 0, 70
+    position = 0, 80
     halign = center
     valign = bottom
 }
@@ -148,8 +149,8 @@ label {
 label {
     monitor =
     text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
-    color = $color8
-    font_size = 24
+    color = $color13
+    font_size = 18
     font_family = Victor Mono Bold Oblique
     position = 0, 0
     halign = right
@@ -160,8 +161,8 @@ label {
 label {
     monitor =
     text = cmd[update:1000] echo "<b> "$($Scripts/Battery.sh)" </b>"
-    color = $color8
-    font_size = 16
+    color = $color13
+    font_size = 18
     font_family = Victor Mono Bold Oblique
     position = 0, 30
     halign = right
@@ -173,9 +174,9 @@ label {
 # see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock
 label {
     monitor =
-    text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache"
-    color = $color8
-    font_size = 14
+    text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat  "$HOME/.cache/.weather_cache"
+    color = $color13
+    font_size = 18
     font_family = Victor Mono Bold Oblique
     position = 50, 0
     halign = left
-- 
cgit v1.2.3


From fbcaa735e0e39ff3c2c018e9955f8eca7a295854 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Thu, 13 Nov 2025 13:05:20 -0500
Subject: Updated hyprlock 1080 to horizontal layout

Adjust fontsize and colors

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   hyprlock-1080p.conf
---
 config/hypr/hyprlock-1080p.conf | 80 ++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index 14f2f35e..4251ac68 100644
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -37,9 +37,9 @@ label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
     color = $color13
-    font_size = 16
+    font_size = 48 
     font_family = Victor Mono Bold Italic
-    position = 0, -120
+    position = 0, -60
     halign = center
     valign = center
 }
@@ -47,42 +47,42 @@ label {
 # Hour-Time
 label {
     monitor =
-    text = cmd[update:1000] echo "$(date +"%H")"
-#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
+#     text = cmd[update:1000] echo "$(date +"%H")"
+    text = cmd[update:1000] echo "$(date +"%I:%M %p")" #AM/PM
 	#color = rgba(255, 185, 0, .8)
-    color = $color13
-    font_size = 200
+    color = $color8
+    font_size = 130
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -60
+    position = 0, -250
     halign = center
     valign = top
 }
 
 # Minute-Time
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%M")"
-    #color = rgba(15, 10, 222, .8)
-    color = $color12
-    font_size = 200
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -340
-    halign = center
-    valign = top
-}
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(date +"%M")"
+#     #color = rgba(15, 10, 222, .8)
+#     color = $color12
+#     font_size = 150
+#     font_family = JetBrainsMono Nerd Font ExtraBold
+#     position = 0, -340
+#     halign = center
+ #    valign = top
+# }
 
 # Seconds-Time
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%S")"
+#label {
+#    monitor =
+##     text = cmd[update:1000] echo "$(date +"%S")"
 #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-    color = $color11
-    font_size = 35
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -350
-    halign = center
-    valign = top
-}
+#    color = $color11
+#    font_size = 32
+#    font_family = JetBrainsMono Nerd Font ExtraBold
+#    position = 0, -350
+#    halign = center
+#    valign = top
+#}
 
 # Put a picture of choice here. Default is the current wallpaper
 #image {
@@ -103,10 +103,10 @@ label {
 label {
     monitor =
     text =   $USER
-    color = $color13
-    font_size = 24
+    color = $color9
+    font_size = 36
     font_family = Victor Mono Bold Oblique
-    position = 0, 220
+    position = 0, 275
     halign = center
     valign = bottom
 }
@@ -114,12 +114,12 @@ label {
 # INPUT FIELD
 input-field {
     monitor =
-    size = 200, 60
+    size = 230, 70
     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
     dots_center = true
-    outer_color = $color11
+    outer_color = $color8
     inner_color = rgba(255, 255, 255, 0.1)
 	capslock_color = rgb(255,255,255)
     font_color = $color13
@@ -136,8 +136,8 @@ input-field {
 label {
     monitor =
     text = $LAYOUT
-    color = $color13
-    font_size = 10
+    color = $color8
+    font_size = 14
     font_family = Victor Mono Bold Oblique
     position = 0, 70
     halign = center
@@ -148,8 +148,8 @@ label {
 label {
     monitor =
     text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
-    color = $color13
-    font_size = 16
+    color = $color8
+    font_size = 24
     font_family = Victor Mono Bold Oblique
     position = 0, 0
     halign = right
@@ -160,7 +160,7 @@ label {
 label {
     monitor =
     text = cmd[update:1000] echo "<b> "$($Scripts/Battery.sh)" </b>"
-    color = $color13
+    color = $color8
     font_size = 16
     font_family = Victor Mono Bold Oblique
     position = 0, 30
@@ -174,8 +174,8 @@ label {
 label {
     monitor =
     text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat "$HOME/.cache/.weather_cache"
-    color = $color13
-    font_size = 16
+    color = $color8
+    font_size = 14
     font_family = Victor Mono Bold Oblique
     position = 50, 0
     halign = left
-- 
cgit v1.2.3


From 54901ac4859fe53398da51bee4126f51adf78e2b Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Thu, 13 Nov 2025 14:11:29 -0500
Subject: Adj 2k+ res hyprlock.conf to horizontal layout

 On branch development
Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   hyprlock.conf
---
 config/hypr/hyprlock.conf | 101 +++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 51 deletions(-)

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index b67bba51..5aa66adc 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -37,52 +37,52 @@ label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B')" </b>"
     color = $color13
-    font_size = 18
+    font_size = 64
     font_family = Victor Mono Bold Italic
-    position = 0, -120
+    position = 0, -80
     halign = center
     valign = center
 }
 
-# Hour-Time
+# Hour-Time (single horizontal time like 1080p variant)
 label {
     monitor =
-    text = cmd[update:1000] echo "$(date +"%H")"
-#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
+#     text = cmd[update:1000] echo "$(date +"%H:%M")"   # 24h option
+    text = cmd[update:1000] echo "$(date +"%I:%M %p")" # AM/PM
 	#color = rgba(255, 185, 0, .8)
-    color = $color13
-    font_size = 240
+    color = $color8
+    font_size = 173
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -100
+    position = 0, -333
     halign = center
     valign = top
 }
 
-# Minute-Time
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%M")"
-    #color = rgba(15, 10, 222, .8)
-    color = $color12
-    font_size = 240
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -450
-    halign = center
-    valign = top
-}
-
-# Seconds-Time
-label {
-    monitor =
-    text = cmd[update:1000] echo "$(date +"%S")"
-#    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
-    color = $color11
-    font_size = 50
-    font_family = JetBrainsMono Nerd Font ExtraBold
-    position = 0, -450
-    halign = center
-    valign = top
-}
+# Minute-Time (disabled; kept for reference)
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(date +"%M")"
+#     #color = rgba(15, 10, 222, .8)
+#     color = $color12
+#     font_size = 240
+#     font_family = JetBrainsMono Nerd Font ExtraBold
+#     position = 0, -450
+#     halign = center
+#     valign = top
+# }
+
+# Seconds-Time (disabled; kept for reference)
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(date +"%S")"
+# #    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
+#     color = $color11
+#     font_size = 50
+#     font_family = JetBrainsMono Nerd Font ExtraBold
+#     position = 0, -450
+#     halign = center
+#     valign = top
+# }
 
 # Put a picture of choice here. Default is the current wallpaper
 #image {
@@ -103,10 +103,10 @@ label {
 label {
     monitor =
     text =   $USER
-    color = $color13
-    font_size = 24
+    color = $color9
+    font_size = 48
     font_family = Victor Mono Bold Oblique
-    position = 0, 280
+    position = 0, 366
     halign = center
     valign = bottom
 }
@@ -114,33 +114,32 @@ label {
 # INPUT FIELD
 input-field {
     monitor =
-    size = 300, 60
+    size = 306, 93
     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
     dots_center = true
-    outer_color = $color11
+    outer_color = $color8
     inner_color = rgba(255, 255, 255, 0.1)
+	capslock_color = rgb(255,255,255)
     font_color = $color13
-    capslock_color = rgb(255,255,255)
     fade_on_empty = false
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 120
+    position = 0, 133
     halign = center
     valign = bottom
 }
 
-
 # Keyboard LAYOUT
 label {
     monitor =
     text = $LAYOUT
-    color = $color13
-    font_size = 12
+    color = $color8
+    font_size = 19
     font_family = Victor Mono Bold Oblique
-    position = 0, 80
+    position = 0, 93
     halign = center
     valign = bottom
 }
@@ -149,8 +148,8 @@ label {
 label {
     monitor =
     text = cmd[update:60000] echo "<b> "$(uptime -p || $Scripts/UptimeNixOS.sh)" </b>"
-    color = $color13
-    font_size = 18
+    color = $color8
+    font_size = 32
     font_family = Victor Mono Bold Oblique
     position = 0, 0
     halign = right
@@ -161,10 +160,10 @@ label {
 label {
     monitor =
     text = cmd[update:1000] echo "<b> "$($Scripts/Battery.sh)" </b>"
-    color = $color13
-    font_size = 18
+    color = $color8
+    font_size = 21
     font_family = Victor Mono Bold Oblique
-    position = 0, 30
+    position = 0, 40
     halign = right
     valign = bottom
 }
@@ -175,8 +174,8 @@ label {
 label {
     monitor =
     text = cmd[update:3600000] [ -f "$HOME/.cache/.weather_cache" ] && cat  "$HOME/.cache/.weather_cache"
-    color = $color13
-    font_size = 18
+    color = $color8
+    font_size = 19
     font_family = Victor Mono Bold Oblique
     position = 50, 0
     halign = left
-- 
cgit v1.2.3


From 872b09fa88825ec5631ba3cdc21e0e717ec241ee Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Thu, 13 Nov 2025 14:26:34 -0500
Subject: Adj layout for 2k+ monitors

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   hyprlock.conf
---
 config/hypr/hyprlock.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 5aa66adc..f359357f 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -39,7 +39,7 @@ label {
     color = $color13
     font_size = 64
     font_family = Victor Mono Bold Italic
-    position = 0, -80
+    position = 0, -20
     halign = center
     valign = center
 }
@@ -53,7 +53,7 @@ label {
     color = $color8
     font_size = 173
     font_family = JetBrainsMono Nerd Font ExtraBold 
-    position = 0, -333
+    position = 0, -133
     halign = center
     valign = top
 }
@@ -106,7 +106,7 @@ label {
     color = $color9
     font_size = 48
     font_family = Victor Mono Bold Oblique
-    position = 0, 366
+    position = 0, 300
     halign = center
     valign = bottom
 }
@@ -127,7 +127,7 @@ input-field {
     font_family = Victor Mono Bold Oblique
     placeholder_text = <i><span foreground="##ffffff99">🔒 Type Password</span></i>
     hide_input = false
-    position = 0, 133
+    position = 0, 100
     halign = center
     valign = bottom
 }
@@ -139,7 +139,7 @@ label {
     color = $color8
     font_size = 19
     font_family = Victor Mono Bold Oblique
-    position = 0, 93
+    position = 0, 53
     halign = center
     valign = bottom
 }
-- 
cgit v1.2.3