Merge branches 'upstream-hidpi' and 'upstream-custom' into dev

hypr/conf/autostart.conf

@@ -26,11 +26,8 @@ exec-once = hypridle
 # Load cliphist history
 exec-once = wl-paste --watch cliphist store
 
-# Initialize swww
-exec-once = swww init || swww-daemon --format xrgb
-
-# Load last wallpaper and waybar with pywal colors
-exec-once = ~/dotfiles/hypr/scripts/wallpaper.sh init
+# Initialize Wallpaper Engine
+exec-once = ~/dotfiles/hypr/scripts/init-wallpaper-engine.sh
 
 # Start ML4W Welcome App
 exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh

hypr/hypridle.conf

@@ -8,9 +8,16 @@
 # Version 2.8.3
 # DO NOT REMOVE THE REPLACEMENT COMMENTS
 # REQUIRED BY THE ML4W SETTINGS APP
+# https://wiki.hyprland.org/Hypr-Ecosystem/hypridle/
+
+# general {
+#     ignore_dbus_inhibit = false
+# }
 
 general {
-    ignore_dbus_inhibit = false
+    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+    before_sleep_cmd = loginctl lock-session    # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
 }
 
 # Screenlock
@@ -18,7 +25,7 @@ listener {
     # HYPRLOCK TIMEOUT
     timeout = 600
     # HYPRLOCK ONTIMEOUT
-    on-timeout = hyprlock
+    on-timeout = loginctl lock-session
 }
 
 # dpms

hypr/hyprpaper.conf

@@ -0,0 +1,3 @@
+preload = $HOME/wallpaper/hyprland.jpg
+wallpaper = ,$HOME/wallpaper/hyprland.jpg
+splash = false

hypr/scripts/init-wallpaper-engine.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww init
+    swww-daemon --format xrgb
+    sleep 0.5
+    ~/dotfiles/hypr/scripts/wallpaper.sh init
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then    
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    sleep 0.5
+    ~/dotfiles/hypr/scripts/wallpaper.sh init
+else
+    echo ":: Wallpaper Engine disabled"
+    ~/dotfiles/hypr/scripts/wallpaper.sh init
+fi
+

hypr/scripts/restart-hypridle.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+killall hypridle
+sleep 1
+hypridle &
+notify-send "hypridle has been restarted."

hypr/scripts/wallpaper.sh

@@ -88,12 +88,27 @@ transition_type="wipe"
 # transition_type="outer"
 # transition_type="random"
 
-swww img $wallpaper \
-    --transition-bezier .43,1.19,1,.4 \
-    --transition-fps=60 \
-    --transition-type=$transition_type \
-    --transition-duration=0.7 \
-    --transition-pos "$( hyprctl cursorpos )"
+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww img $wallpaper \
+        --transition-bezier .43,1.19,1,.4 \
+        --transition-fps=60 \
+        --transition-type=$transition_type \
+        --transition-duration=0.7 \
+        --transition-pos "$( hyprctl cursorpos )"
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    killall hyprpaper
+    wal_tpl=$(cat $HOME/dotfiles/.settings/hyprpaper.tpl)
+    output=${wal_tpl//WALLPAPER/$wallpaper}
+    echo "$output" > $HOME/dotfiles/hypr/hyprpaper.conf
+    hyprpaper &
+else
+    echo ":: Wallpaper Engine disabled"
+fi
 
 if [ "$1" == "init" ] ;then
     echo ":: Init"