tested

home-manager/users/nathan/packages/scripts/default.nix

@@ -29,38 +29,43 @@
                     mkdir /tmp/nathan
                 fi
 
-	            img=''$(realpath ''$1)
+	            img=''$(realpath "''${1:-$(find ~/Pictures/Wallpaper | rofi -dmenu)}")
-	            ext="''${''$(basename ''$img)''\#''\#*.}"
+                n=''$(basename "''$img")
+	            ext="''${n''\#''\#*.}"
 
                 if [[ ''$ext == "gif" || ''$ext == "mp4" ]]; then
-                    ${pkgs.ffmpeg}/bin/ffmpeg -i ''$img -vframes 1 /tmp/nathan/tmp.jpg
+                    yes | ${pkgs.ffmpeg}/bin/ffmpeg -i "''$img" -vframes 1 /tmp/nathan/tmp.jpg
+                    pidof mpvpaper && pkill mpvpaper
                     ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe
                     sleep 0.3
                     hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
-                else
-
                     hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw ~/Pictures/Wallpaper/bluescape.jpg
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg
+                else
+                    pidof mpvpaper && pkill mpvpaper
+                    hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe"
+                    ${pkgs.hyprpanel}/bin/hyprpanel sw "''$img"
                 fi
 
-                ${pkgs.hyprpanel}/bin/hyprpanel sw ''$img
+                changeColors "''$img" "''$2"
-                changeColors ''$img ''$2
 	        '')
 
 	        (pkgs.writeShellScriptBin "changeColors" ''
 
-                img=''$(realpath ''$1)
+                img=''$(realpath "''$1")
                 alpha=''${2:-70}
 
                 if [[ ''$alpha -lt 0 ]]; then
-                ''$alpha=0
+                alpha=0
                 elif [[ ''$alpha -gt 100 ]]; then
-                ''$alpha=100
+                alpha=100
                 fi
 
-                if [[ -f "~/.config/wal/colorschemes/dark/''${''$(basename ''$img)}-''$alpha.json" ]]; then
+                if [[ -f ~/.config/wal/colorschemes/dark/''$(basename "''$img")-''$alpha.json ]]; then
-                    ${pkgs.pywal16}/bin/wal -n -f "''${''$(basename ''$img)}-''$alpha"
+                    ${pkgs.pywal16}/bin/wal -n -f "''$(basename "''$img")-''$alpha"
                 else
-	                ${pkgs.pywal16}/bin/wal -n -i ''$img -a ''$alpha --cols16 -p "''${''$(basename ''$img)}-''$alpha"
+	                ${pkgs.pywal16}/bin/wal -n -i "''$img" -a "''$alpha" --cols16 -p "''$(basename "''$img")-''$alpha"
                 fi
 
 	            colorPrefix