Changed SWWW to AWWW as it's no longer maintined
On branch main Your branch is up to date with 'origin/main'. Changes to be committed: modified: FAQ.es.md modified: FAQ.md modified: modules/home/hyprland/exec-once.nix modified: modules/home/hyprland/hyprland.nix modified: modules/home/scripts/keybinds-parser.nix modified: modules/home/scripts/qs-vid-wallpapers-apply.nix modified: modules/home/scripts/qs-wallpapers-apply.nix modified: modules/home/scripts/qs-wallpapers-restore.nix modified: modules/home/scripts/wallsetter.nix
This commit is contained in:
parent
27ba6b3935
commit
4f7e54a218
9 changed files with 53 additions and 53 deletions
|
|
@ -825,7 +825,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
|||
<summary>** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? **</summary>
|
||||
|
||||
1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file.
|
||||
2. Comenta la línea `sleep 1.5 && swww img ...`
|
||||
2. Comenta la línea `sleep 1.5 && awww img ...`
|
||||
3. Agrega nueva línea después de eso con `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -833,13 +833,13 @@ settings = {
|
|||
exec-once = [
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"killall -q swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
|
|||
12
FAQ.md
12
FAQ.md
|
|
@ -811,7 +811,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
|||
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
|
||||
|
||||
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
|
||||
2. Comment out the line `sleep 1.5 && swww img ...`
|
||||
2. Comment out the line `sleep 1.5 && awww img ...`
|
||||
3. Add new line after that with `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -819,13 +819,13 @@ settings = {
|
|||
exec-once = [
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"killall -q swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
@ -2002,7 +2002,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
|||
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
|
||||
|
||||
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
|
||||
2. Comment out the line `sleep 1.5 && swww img ...`
|
||||
2. Comment out the line `sleep 1.5 && awww img ...`
|
||||
3. Add new line after that with `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -2010,13 +2010,13 @@ settings = {
|
|||
exec-once = [
|
||||
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"killall -q swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@
|
|||
waybarExec =
|
||||
if barChoice != "noctalia"
|
||||
then [
|
||||
"killall -q swww;sleep .5 && swww-daemon"
|
||||
"killall -q awww;sleep .5 && awww-daemon"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
# Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change
|
||||
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'"
|
||||
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'"
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
hyprKbVariant = variantFinal;
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
swww
|
||||
awww
|
||||
grim
|
||||
slurp
|
||||
wl-clipboard
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" ''
|
|||
else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor"
|
||||
else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher"
|
||||
else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser"
|
||||
else if (low ~ /(swww|wallpaper)/) category="wallpaper"
|
||||
else if (low ~ /(awww|wallpaper)/) category="wallpaper"
|
||||
else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media"
|
||||
else category="app"
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" ''
|
|||
|
||||
case "$BACKEND" in
|
||||
mpvpaper)
|
||||
log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
log "Sleeping briefly before starting mpvpaper"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
# Auto-detect sensible default backend per compositor when not provided via env
|
||||
if [ -z "''${BACKEND:-}" ]; then
|
||||
if [ "''${XDG_SESSION_DESKTOP:-}" = "Niri" ] || [ "''${XDG_CURRENT_DESKTOP:-}" = "Niri" ] || command -v niri >/dev/null 2>&1; then
|
||||
BACKEND="swww"
|
||||
BACKEND="awww"
|
||||
else
|
||||
BACKEND="mpvpaper"
|
||||
fi
|
||||
|
|
@ -96,8 +96,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
case "$BACKEND" in
|
||||
mpvpaper)
|
||||
# Stop other wallpaper daemons to avoid conflicts
|
||||
log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
# Give the compositor a moment to release layers
|
||||
|
|
@ -120,16 +120,16 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
exit 0
|
||||
;;
|
||||
|
||||
swww)
|
||||
awww)
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
# 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 || true
|
||||
# Start awww-daemon if needed (newer awww has no 'init' subcommand)
|
||||
if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then
|
||||
log "Starting awww-daemon"
|
||||
${pkgs.awww}/bin/awww-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
|
||||
log "swww-daemon ready"
|
||||
if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then
|
||||
log "awww-daemon ready"
|
||||
break
|
||||
fi
|
||||
${pkgs.coreutils}/bin/sleep 0.1
|
||||
|
|
@ -139,26 +139,26 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
|
||||
|
||||
# Robust resize: if WALLPAPER_RESIZE is set, use it; otherwise try fill -> fit -> crop
|
||||
run_swww_img() {
|
||||
run_awww_img() {
|
||||
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
|
||||
log "swww img --resize ''${WALLPAPER_RESIZE} $sel"
|
||||
${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel"
|
||||
log "awww img --resize ''${WALLPAPER_RESIZE} $sel"
|
||||
${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel"
|
||||
return $?
|
||||
fi
|
||||
log "Trying swww resize modes: fill -> fit -> crop"
|
||||
${pkgs.swww}/bin/swww img --resize fill "$sel" || \
|
||||
${pkgs.swww}/bin/swww img --resize fit "$sel" || \
|
||||
${pkgs.swww}/bin/swww img --resize crop "$sel"
|
||||
log "Trying awww resize modes: fill -> fit -> crop"
|
||||
${pkgs.awww}/bin/awww img --resize fill "$sel" || \
|
||||
${pkgs.awww}/bin/awww img --resize fit "$sel" || \
|
||||
${pkgs.awww}/bin/awww img --resize crop "$sel"
|
||||
}
|
||||
|
||||
# Niri: generic apply has proven to work more reliably than per-output here
|
||||
run_swww_img
|
||||
run_awww_img
|
||||
exit $?
|
||||
;;
|
||||
|
||||
hyprpaper)
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
# Generate a minimal hyprpaper config and start it
|
||||
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
|
||||
_CFG="$_TMPDIR/hyprpaper.conf"
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
hyprlock-update-wallpaper-link >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
# Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper
|
||||
ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper"
|
||||
# Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper
|
||||
ORDER_DEFAULT="awww,hyprpaper,mpvpaper,waypaper"
|
||||
ORDER_COMBINED="$BACKEND_J,$ORDER_DEFAULT"
|
||||
# De-duplicate while preserving order (awk trick)
|
||||
ORDER=$({ echo "$ORDER_COMBINED" | ${pkgs.coreutils}/bin/tr ',' '\n' | ${pkgs.gawk}/bin/awk 'NF{ if (!seen[$0]++) print $0 }' | ${pkgs.coreutils}/bin/tr '\n' ','; echo; } | ${pkgs.coreutils}/bin/tr -s ',' | ${pkgs.gnused}/bin/sed 's/^,\|,$//g')
|
||||
|
|
@ -50,35 +50,35 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
return 1
|
||||
}
|
||||
|
||||
start_swww() {
|
||||
start_awww() {
|
||||
|
||||
# Stop conflicting daemons if we intend to use swww
|
||||
# Stop conflicting daemons if we intend to use awww
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
|
||||
|
||||
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 || true
|
||||
if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then
|
||||
log "Starting awww-daemon"
|
||||
${pkgs.awww}/bin/awww-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
|
||||
if ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then break; fi
|
||||
${pkgs.coreutils}/bin/sleep 0.1
|
||||
done
|
||||
fi
|
||||
# Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop
|
||||
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
|
||||
log "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
|
||||
${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
|
||||
log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
|
||||
${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
|
||||
else
|
||||
log "Trying swww resize modes: fill -> fit -> crop"
|
||||
${pkgs.swww}/bin/swww img --resize fill "$PATH_J" || \
|
||||
${pkgs.swww}/bin/swww img --resize fit "$PATH_J" || \
|
||||
${pkgs.swww}/bin/swww img --resize crop "$PATH_J"
|
||||
log "Trying awww resize modes: fill -> fit -> crop"
|
||||
${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \
|
||||
${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \
|
||||
${pkgs.awww}/bin/awww img --resize crop "$PATH_J"
|
||||
fi
|
||||
}
|
||||
|
||||
start_hyprpaper() {
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
|
||||
_CFG="$_TMPDIR/hyprpaper.conf"
|
||||
{
|
||||
|
|
@ -94,7 +94,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
}
|
||||
|
||||
start_mpvpaper() {
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
${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"
|
||||
|
|
@ -104,7 +104,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
start_waypaper() {
|
||||
if command -v waypaper >/dev/null 2>&1; then
|
||||
log "Trying waypaper"
|
||||
waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
|
||||
waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -113,7 +113,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
IFS=',' read -r -a tools <<<"$ORDER"
|
||||
for t in "''${tools[@]}"; do
|
||||
case "$t" in
|
||||
swww) start_swww && exit 0 || log "swww failed; falling back" ;;
|
||||
awww) start_awww && exit 0 || log "awww failed; falling back" ;;
|
||||
hyprpaper) start_hyprpaper && exit 0 || log "hyprpaper failed; falling back" ;;
|
||||
mpvpaper) start_mpvpaper && exit 0 || log "mpvpaper failed; falling back" ;;
|
||||
waypaper) start_waypaper && exit 0 || log "waypaper failed; falling back" ;;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" ''
|
|||
|
||||
PREVIOUS=$WALLPAPER
|
||||
|
||||
${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
|
||||
${pkgs.awww}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
|
||||
sleep $TIMEOUT
|
||||
done
|
||||
''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue