From 52611ff7d54fdd8f49a0ed29ed42c560140ec16c Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 20 Mar 2025 21:01:55 -0500 Subject: [PATCH] improve setWallpaper --- home-manager/nathan/packages/scripts/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/home-manager/nathan/packages/scripts/default.nix b/home-manager/nathan/packages/scripts/default.nix index d72275b..9d72c6d 100644 --- a/home-manager/nathan/packages/scripts/default.nix +++ b/home-manager/nathan/packages/scripts/default.nix @@ -29,11 +29,18 @@ (pkgs.writeShellScriptBin "setWallpaper" '' img=''$(realpath ''${1:-~/.cache/bg}) - p=''$(ps -e | grep mpvpaper | sed -n -e "s/ *//" -e "s/ /\n/" -e "1 P") - ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img && \ - changeColors $img $2 && \ + p=''$(pgrep mpvpaper) + ext=$(echo ''$img | sed "s|\(.*\)\.\(.*\)|\2|") + if [[ ''$ext == "jpg" || ''$ext == "png" ]]; then + ${pkgs.mpvpaper}/bin/mpvpaper -f -p -o --pause '*' ''$img + else + ${pkgs.mpvpaper}/bin/mpvpaper -f -p -o "loop" '*' ''$img + fi + changeColors ''$img ''$2 && \ sleep 0.4 && \ - kill $p + if [[ ''$p ]]; then + kill ''$p + fi '') (pkgs.writeShellScriptBin "changeColors" ''