Merge branch 'fix-wallpaper' into 'main'

Fixed qs-wallpaper qs-logout didn't work from rofi or binding

See merge request Zaney/zaneyos!192
This commit is contained in:
Don Williams 2026-03-16 04:17:28 -04:00
commit 3773b596a3
8 changed files with 22 additions and 9 deletions

View file

@ -5,7 +5,14 @@
---
# 🚀 **Current Release - ZaneyOS v2.6.0**
# 🚀 **Current Release - ZaneyOS v2.6.1**
#### 📅 **Updated: March 16th, 2026**
- Fixed issues with `qs-wallpaper,qs-wlogout`
- Forced Qt/QML logs to console in qs-wallpapers, qs-vid-wallpapers, and qs-wlogout
- Soo the wrapper scripts can parse selections/commands when launched from Waybar/Rofi.
- Made disown non‑fatal in qs-wallpapers-apply, qs-vid-wallpapers-apply, and qs-wallpapers-restore.
#### 📅 **Updated: February 19th, 2026**

View file

@ -29,7 +29,7 @@ in {
};
environment.variables = {
NIXOS_OZONE_WL = "1";
ZANEYOS_VERSION = "2.6.0";
ZANEYOS_VERSION = "2.6.1";
ZANEYOS = "true";
};
console.keyMap = "${consoleKeyMap}";

View file

@ -88,7 +88,7 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" ''
-o "$opts" \
'*' "$sel" >/dev/null 2>&1 &
fi
disown
disown || true
log "mpvpaper launched"
exit 0
;;

View file

@ -509,6 +509,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers" ''
# Prepare QML runtime environment (Qt6)
export QT_QPA_PLATFORM="wayland;xcb"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_LOGGING_TO_CONSOLE="1"
export QT_FORCE_STDERR_LOGGING="1"
export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml"
export QML2_IMPORT_PATH="$QML_IMPORT_PATH"

View file

@ -115,7 +115,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
-o "$MPV_OPTS" \
'*' "$sel" >/dev/null 2>&1 &
fi
disown
disown || true
log "mpvpaper launched"
exit 0
;;
@ -125,7 +125,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
# Start swww-daemon if needed (newer swww has no 'init' subcommand)
if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
log "Starting swww-daemon"
${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown
${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true
# wait briefly for the daemon to be ready
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
@ -177,7 +177,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
else
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 &
fi
disown
disown || true
exit 0
;;

View file

@ -58,7 +58,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
log "Starting swww-daemon"
${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown
${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi
${pkgs.coreutils}/bin/sleep 0.1
@ -90,7 +90,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
echo "wallpaper = $mon,$PATH_J" >> "$_CFG"
done
log "Starting hyprpaper"
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown || true
}
start_mpvpaper() {
@ -98,7 +98,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0"
log "Starting mpvpaper"
${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown
${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown || true
}
start_waypaper() {

View file

@ -361,6 +361,8 @@ pkgs.writeShellScriptBin "qs-wallpapers" ''
# Prepare QML runtime environment (Qt6)
export QT_QPA_PLATFORM="wayland;xcb"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_LOGGING_TO_CONSOLE="1"
export QT_FORCE_STDERR_LOGGING="1"
export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml"
export QML2_IMPORT_PATH="$QML_IMPORT_PATH"

View file

@ -232,6 +232,8 @@ in
# Setup Qt6 environment with proper app identification
export QT_QPA_PLATFORM="wayland;xcb"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_LOGGING_TO_CONSOLE="1"
export QT_FORCE_STDERR_LOGGING="1"
export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml"
export QML2_IMPORT_PATH="$QML_IMPORT_PATH"