From b9b9cd59d751d3defc207bac50a59edf903ee083 Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 3 Jul 2025 22:24:25 -0500 Subject: [PATCH] revert to swww --- .../nathan/packages/scripts/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/home-manager/nathan/packages/scripts/default.nix b/home-manager/nathan/packages/scripts/default.nix index 9d72c6d..62d4776 100644 --- a/home-manager/nathan/packages/scripts/default.nix +++ b/home-manager/nathan/packages/scripts/default.nix @@ -12,12 +12,12 @@ #scripts (pkgs.writeShellScriptBin "_systemRebuild" '' - ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/System + ${pkgs.nh}/bin/nh os switch --ask /home/nathan/Projects/Olympus echo //////Enter to close////// read '') (pkgs.writeShellScriptBin "_homeRebuild" '' - ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/System + ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus echo //////Enter to close////// read '') @@ -29,18 +29,8 @@ (pkgs.writeShellScriptBin "setWallpaper" '' img=''$(realpath ''${1:-~/.cache/bg}) - 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 && \ - if [[ ''$p ]]; then - kill ''$p - fi + ${pkgs.swww}/bin/swww img ''$img + changeColors ''$img ''$2 '') (pkgs.writeShellScriptBin "changeColors" '' @@ -82,6 +72,7 @@ '') (pkgs.writeShellScriptBin "onSystemStart" '' + ${pkgs.swww}/bin/swww-daemon & randWallpaper & ags & pypr &