Merge branch 'main' into main

16 files changed, 102 insertions, 125 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 09ae1bdb..a0ba2c15 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -44,8 +44,9 @@ env = QT_SCALE_FACTOR,1
 # firefox
 env = MOZ_ENABLE_WAYLAND,1
 
-# electron >28 apps (may help)
-env = ELECTRON_OZONE_PLATFORM_HINT,auto
+# electron >28 apps (may help) ##
+# https://www.electronjs.org/docs/latest/api/environment-variables
+env = ELECTRON_OZONE_PLATFORM_HINT,auto # auto selects Wayland if possible, X11 otherwise
 
 # NVIDIA 
 # This is from Hyprland Wiki. Below will be activated nvidia gpu detected
@@ -55,12 +56,6 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto
 #env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 #env = NVD_BACKEND,direct 
 
-# to use nvidia as primary renderer (need hyprland >0.45)
-#env = AQ_DRM_DEVICES,/dev/dri/card1 (nvidia)
-#env = AQ_DRM_DEVICES,/dev/dri/card0
-
-#env = AQ_NO_ATOMIC,1 #use legacy DRM interface
-
 # additional ENV's for nvidia. Caution, activate with care
 #env = GBM_BACKEND,nvidia-drm 
 
@@ -77,4 +72,18 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto
 # nvidia firefox (for hardware acceleration on FF)?
 # check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration
 #env = MOZ_DISABLE_RDD_SANDBOX,1
-#env = EGL_PLATFORM,wayland
\ No newline at end of file
+#env = EGL_PLATFORM,wayland
+
+#### Aquamarine Environment Variables #### ( Hyprland > 0.45 )
+# https://wiki.hyprland.org/Configuring/Environment-variables/#aquamarine-environment-variables----ref-httpsgithubcomhyprwmaquamarineblobmaindocsenvmd---
+# env = AQ_TRACE,1 # Enables more verbose logging.
+# env = AQ_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0 # Set an explicit list of DRM devices (GPUs) to use. It’s a colon-separated list of paths, with the first being the primary. E.g. /dev/dri/card1:/dev/dri/card0
+# env = AQ_MGPU_NO_EXPLICIT,1 # Disables explicit syncing on mgpu buffers
+# env = AQ_NO_MODIFIERS,1 # Disables modifiers for DRM buffers
+
+#### Hyprland Environment Variables ####
+# https://wiki.hyprland.org/Configuring/Environment-variables/#hyprland-environment-variables
+# env = HYPRLAND_TRACE,1 # Enables more verbose logging.
+# env = HYPRLAND_NO_RT,1 # Disables realtime priority setting by Hyprland.
+# env = HYPRLAND_NO_SD_NOTIFY,1 # If systemd, disables the 'sd_notify' calls.
+# env = HYPRLAND_NO_SD_VARS,1 # Disables management of variables in systemd and dbus activation environments.
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 42ab5710..46c5fc35 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -141,6 +141,8 @@ windowrulev2 = size 70% 60%, title:^(Add Folder to Workspace)$
 windowrulev2 = center, title:^(Add Folder to Workspace)$
 windowrulev2 = float, initialTitle:(Open Files)
 windowrulev2 = size 70% 60%, initialTitle:(Open Files)
+windowrulev2 = float, title:^(SDDM Background)$ #KooL's Dots YAD for setting SDDM background
+windowrulev2 = size 10% 10%, title:^(SDDM Background)$ #KooL's Dots YAD for setting SDDM background
 
 # OPACITY
 windowrulev2 = opacity 0.9 0.7, tag:browser*
diff --git a/config/hypr/UserConfigs/WorkSpaceRules b/config/hypr/UserConfigs/WorkSpaceRules
new file mode 100644
index 00000000..aa86b35c
--- /dev/null
+++ b/config/hypr/UserConfigs/WorkSpaceRules
@@ -0,0 +1,32 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
+# NOTE: THIS IS NOT BEING SOURCED by hyprland
+# It is only here as a guide if you want to do it manually
+# The file you should edit is ~/.config/hypr/workspaces.conf
+# Since that is the work space rules being sourced by hyprland
+# use nwg-displays to handle your workspace rules.
+
+# You can set workspace rules to achieve workspace-specific behaviors. 
+# For instance, you can define a workspace where all windows are drawn without borders or gaps.
+
+# https://wiki.hyprland.org/Configuring/Workspace-Rules/
+
+# Assigning workspace to a certain monitor. Below are just examples
+# workspace = 1, monitor:eDP-1
+# workspace = 2, monitor:eDP-1
+# workspace = 3, monitor:eDP-1
+# workspace = 4, monitor:eDP-1
+# workspace = 5, monitor:DP-2
+# workspace = 6, monitor:DP-2
+# workspace = 7, monitor:DP-2
+# workspace = 8, monitor:DP-2
+
+
+# example rules (from wiki)
+# workspace = 3, rounding:false, decorate:false
+# workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false, monitor:DP-1
+# workspace = 8,bordersize:8
+# workspace = name:Hello, monitor:DP-1, default:true
+# workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true
+# workspace = 5, on-created-empty:[float] firefox
+# workspace = special:scratchpad, on-created-empty:foot
\ No newline at end of file
diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/UserScripts/Kool_Quick_Settings.sh
index 3e70fee3..7b41512e 100755
--- a/config/hypr/UserScripts/Kool_Quick_Settings.sh
+++ b/config/hypr/UserScripts/Kool_Quick_Settings.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# Rofi menu for Quick Edit/View of Settings (SUPER SHIFT E)
+# Rofi menu for KooL Hyprland Quick Settings (SUPER SHIFT E)
 
 # Define preferred text editor and terminal
 edit=${EDITOR:-nano}
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 948c637c..5ddc9fd3 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -101,36 +101,22 @@ fi
 main
 
 sleep 1
-# Check if user selected a wallpaper
+
 if [[ -n "$choice" ]]; then
   sddm_sequoia="/usr/share/sddm/themes/sequoia_2"
   if [ -d "$sddm_sequoia" ]; then
-    notify-send -i "$iDIR/ja.png" "Set wallpaper" "as SDDM background?" \
-      -t 10000 \
-      -A "yes=Yes" \
-      -A "no=No" \
-      -h string:x-canonical-private-synchronous:wallpaper-notify
-
-    # Wait for user input using dbus-monitor
-    dbus-monitor "interface='org.freedesktop.Notifications',member='ActionInvoked'" |
-    while read -r line; do
-      if echo "$line" | grep -q "yes"; then
+    if yad --question --text="Set wallpaper as SDDM background?\nNOTE: This only applies to SEQUOIA SDDM Theme" --title="SDDM Background" --ok-label="Yes"; then
 
     # Check if terminal exists
-	if ! command -v "$terminal" &>/dev/null; then
-   	  notify-send -i "$iDIR/ja.png" "Missing $terminal" "Install $terminal to enable setting of wallpaper background"
-   	  exit 1
-	fi
-			
+    if ! command -v "$terminal" &>/dev/null; then
+    notify-send -i "$iDIR/ja.png" "Missing $terminal" "Install $terminal to enable setting of wallpaper background"
+    exit 1
+    fi
+
+      # Open terminal and set the wallpaper
     $terminal -e bash -c "echo 'Enter your password to set wallpaper as SDDM Background'; \
     sudo cp -r $wallpaper_output '$sddm_sequoia/backgrounds/default' && \
     notify-send -i '$iDIR/ja.png' 'SDDM' 'Background SET'"
-    break
-  elif echo "$line" | grep -q "no"; then
-    echo "Wallpaper not set as SDDM background. Exiting."
-    break
-  fi
-  
-  done &
+    fi
   fi
 fi
\ No newline at end of file
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 78bf8d2f..272797e3 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -130,32 +130,18 @@ sleep 1
 if [[ -n "$choice" ]]; then
   sddm_sequoia="/usr/share/sddm/themes/sequoia_2"
   if [ -d "$sddm_sequoia" ]; then
-    notify-send -i "$iDIR/ja.png" "Set wallpaper" "as SDDM background?" \
-      -t 10000 \
-      -A "yes=Yes" \
-      -A "no=No" \
-      -h string:x-canonical-private-synchronous:wallpaper-notify
-
-    # Wait for user input using dbus-monitor
-    dbus-monitor "interface='org.freedesktop.Notifications',member='ActionInvoked'" |
-    while read -r line; do
-      if echo "$line" | grep -q "yes"; then
+    if yad --question --text="Set wallpaper as SDDM background?\nNOTE: This only applies to SEQUOIA SDDM Theme" --title="SDDM Background" --ok-label="Yes"; then
 
     # Check if terminal exists
-	if ! command -v "$terminal" &>/dev/null; then
-   	  notify-send -i "$iDIR/ja.png" "Missing $terminal" "Install $terminal to enable setting of wallpaper background"
-   	  exit 1
-	fi
-			
+    if ! command -v "$terminal" &>/dev/null; then
+    notify-send -i "$iDIR/ja.png" "Missing $terminal" "Install $terminal to enable setting of wallpaper background"
+    exit 1
+    fi
+
+    # Open terminal to enter password
     $terminal -e bash -c "echo 'Enter your password to set wallpaper as SDDM Background'; \
     sudo cp -r $wallpaper_current '$sddm_sequoia/backgrounds/default' && \
     notify-send -i '$iDIR/ja.png' 'SDDM' 'Background SET'"
-    break
-  elif echo "$line" | grep -q "no"; then
-    echo "Wallpaper not set as SDDM background. Exiting."
-    break
-  fi
-  
-  done &
+    fi
   fi
 fi
\ No newline at end of file
diff --git a/config/hypr/monitors.conf b/config/hypr/monitors.conf
index b3b75847..74a60819 100644
--- a/config/hypr/monitors.conf
+++ b/config/hypr/monitors.conf
@@ -1,6 +1,14 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# default Monitor config
+
+# *********************************************************** #
+# 
+# NOTE: This will be overwritten by NWG-Displays 
+# once you use and click apply. You can still find this
+# default at ~/.config/hypr/Monitor_Profiles/default.conf
+#
+# *********************************************************** #
 
-# WARN!!! THIS WILL BE OVERWRITTEN by NWG-DISPLAY
 
 # Monitor Configuration
 # See Hyprland wiki for more details
@@ -50,3 +58,4 @@ monitor=,highres,auto,1
 # https://wiki.hyprland.org/Configuring/Workspace-Rules/
 # SUPER E - Workspace-Rules 
 # See ~/.config/hypr/UserConfigs/WorkspaceRules.conf
+
diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh
index 1f720b18..3f83e51f 100755
--- a/config/hypr/scripts/Wlogout.sh
+++ b/config/hypr/scripts/Wlogout.sh
@@ -1,58 +1,4 @@
 #!/bin/bash
-# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
-# wlogout (Power, Screen Lock, Suspend, etc)
+# /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ #
 
-# Parameters for screen resolutions
-declare -A resolutions=(
-    [2160]=450
-    [1600]=450
-    [1440]=450
-    [1080]=350
-    [720]=175
-)
-
-# Check if wlogout is already running, if so, kill it
-if pgrep -x "wlogout" > /dev/null; then
-    pkill -x "wlogout"
-    exit 0
-fi
-
-# Detect the current monitor's native resolution and scale
-monitor_info=$(hyprctl -j monitors | jq -r '.[] | select(.focused==true)')
-
-resolution=$(echo "$monitor_info" | jq -r '.height')
-width=$(echo "$monitor_info" | jq -r '.width')
-hypr_scale=$(echo "$monitor_info" | jq -r '.scale')
-
-# Round hypr_scale to 2 decimal places for accurate comparison
-rounded_scale=$(echo "scale=2; $hypr_scale/1" | bc)
-
-# If resolution or scale is invalid or hypr_scale >= 1.25, run wlogout with -b 3
-if [[ -z "$resolution" || ! "$resolution" =~ ^[0-9]+$ || -z "$hypr_scale" || $(echo "$rounded_scale >= 1.25" | bc) -eq 1 ]]; then
-    echo "Hypr_scale is greater than or equal to 1.25 or resolution could not be detected, running wlogout with -b 3"
-    wlogout --protocol layer-shell -b 3 -T 100 -B 100 &
-    exit 0
-fi
-
-# Determine the appropriate resolution range and calculate T and B values
-if ((resolution >= 2160)); then
-    res_key=2160
-elif ((resolution >= 1600)); then
-    res_key=1600
-elif ((resolution >= 1440)); then
-    res_key=1440
-elif ((resolution >= 1080)); then
-    res_key=1080
-else
-    res_key=720
-fi
-
-# Calculate T and B values based on selected resolution and scale
-T_val=$(awk "BEGIN {printf \"%.0f\", ${resolutions[$res_key]} * $res_key * $hypr_scale / $resolution}")
-B_val=$(awk "BEGIN {printf \"%.0f\", ${resolutions[$res_key]} * $res_key * $hypr_scale / $resolution}")
-
-# Output the resolution setting for debugging purposes
-echo "Setting parameters for resolution >= $res_key"
-
-# Run wlogout with -b 6 and calculated T/B values
-wlogout --protocol layer-shell -b 6 -T $T_val -B $B_val &
\ No newline at end of file
+wlogout -p layer-shell -b 3 -c 2
\ No newline at end of file
diff --git a/config/hypr/workspaces.conf b/config/hypr/workspaces.conf
index 37471b3e..708dee00 100644
--- a/config/hypr/workspaces.conf
+++ b/config/hypr/workspaces.conf
@@ -1,6 +1,11 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 
-# WARN THIS WILL BE OVERWRITTEN by NWG-DISPLAY
+# *********************************************************** #
+# 
+# NOTE: This will be overwritten by NWG-Displays 
+# once you use and click apply. 
+#
+# *********************************************************** #
 
 # You can set workspace rules to achieve workspace-specific behaviors. 
 # For instance, you can define a workspace where all windows are drawn without borders or gaps.
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 34bc3414..e33e8cf6 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -4,7 +4,7 @@
 #include kitty-colors.conf 
 
 font_family FantasqueSansM Nerd Font Mono Bold
-font_size 15.0
+font_size 16.0
 bold_font auto
 italic_font auto
 bold_italic_font auto
diff --git a/config/wlogout/icons/hibernate-hover.png b/config/wlogout/icons/hibernate-hover.png
index 0fd3bade..0ac492d1 100644
--- a/config/wlogout/icons/hibernate-hover.png
+++ b/config/wlogout/icons/hibernate-hover.png
diff --git a/config/wlogout/icons/hibernate-hover1.png b/config/wlogout/icons/hibernate-hover1.png
new file mode 100644
index 00000000..0fd3bade
--- /dev/null
+++ b/config/wlogout/icons/hibernate-hover1.png
diff --git a/config/wlogout/icons/sleep-hover.png b/config/wlogout/icons/sleep-hover.png
index 0ac492d1..b1a5fabb 100644
--- a/config/wlogout/icons/sleep-hover.png
+++ b/config/wlogout/icons/sleep-hover.png
diff --git a/config/wlogout/icons/sleep2.png b/config/wlogout/icons/sleep2.png
new file mode 100644
index 00000000..b87fabf8
--- /dev/null
+++ b/config/wlogout/icons/sleep2.png
diff --git a/config/wlogout/style.css b/config/wlogout/style.css
index 4e53eded..b8341e9a 100644
--- a/config/wlogout/style.css
+++ b/config/wlogout/style.css
@@ -5,16 +5,17 @@
 @import '../../.config/waybar/wallust/colors-waybar.css';
 
 window {
-    font-family: Fira Code Medium;
-    font-size: 16pt;
-    color: #cdd6f4; /* text */
+    font-family: "FantasqueSansM Nerd Font Mono Bold";
+    font-size: 24pt;
+    color: @foreground; /* text */
     background-color: rgba(30, 30, 46, 0.6);
 }
 
 button {
+	margin: 20px;
     background-repeat: no-repeat;
     background-position: center;
-    background-size: 20%;
+    background-size: 30%;
     background-color: rgba(200, 220, 255, 0);
     animation: gradient_f 10s ease-in infinite;
     transition: all 0.3s cubic-bezier(.55, 0.0, .28, 1.682), box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out;
@@ -23,18 +24,19 @@ button {
 }
 
 button:focus {
-    background-size: 50%;
+    background-size: 40%;
 	border: 0px;
+	border-radius: 80px;
 
 }
 
 button:hover {
-    background-color: @color12; 
-    color: #1e1e2e;
-    background-size: 50%;
-    margin: 30px;
+    background-color: transparent; 
+    color: @color11;
+    background-size: 40%;
+    margin: -20px;
     border-radius: 80px;
-	box-shadow: 0 0 30px @color7;
+	/*box-shadow: 0 0 30px @color7;*/
 	
 }
 
diff --git a/copy.sh b/copy.sh
index 83377b8b..23cb3aef 100755
--- a/copy.sh
+++ b/copy.sh
@@ -321,7 +321,7 @@ echo "${OK} You have chosen $resolution resolution." 2>&1 | tee -a "$LOG"
 # Add your commands based on the resolution choice
 if [ "$resolution" == "< 1440p" ]; then
   #cp -r config/rofi/resolution/1080p/* config/rofi/ 10-Feb-2025
-  sed -i 's/font_size 15.0/font_size 13.0/' config/kitty/kitty.conf
+  sed -i 's/font_size 16.0/font_size 14.0/' config/kitty/kitty.conf
 
   # hyprlock matters
   mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf &&