removed default wallpaper scripts. its now set in the varsHEADmain

switched to feh
temp remove of hyprpaper (will either use or remove when and if i use wayland)

5 files changed, 25 insertions, 36 deletions

diff --git a/set-theme b/set-theme
index 516ee88..6c62616 100755
--- a/set-theme
+++ b/set-theme
@@ -89,4 +89,4 @@ done
 
 if [ "$wallpaper" ] && [ $set_wallpaper = 1 ]; then
     setwll -ua "$wallpaper"
-fi
+fi
\ No newline at end of file
diff --git a/setwll b/setwll
index 67e99a8..165f26c 100755
--- a/setwll
+++ b/setwll
@@ -4,8 +4,8 @@ cd "$(dirname "$0")" || exit
 
 listwalls=0
 unload=0
-secondary=""
-primary=""
+secondary="exo"
+primary="exo"
 all=""
 
 while getopts "hlup:s:a:" opt; do
@@ -48,48 +48,38 @@ if [ "$all" ]; then
     secondary="$all"
 fi
 
-if [ -z "$primary" ]; then
-    primary="$(./wallpaper_scripts/default-primary.sh)"
-else
-    if [ -f "./wallpaper_scripts/$primary.sh" ]; then
-        primary="$(./wallpaper_scripts/"$primary.sh")"
-    fi
+if [ -f "./wallpaper_scripts/$primary.sh" ]; then
+    primary="$(./wallpaper_scripts/"$primary.sh")"
 fi
 
-if [ -z "$secondary" ]; then
-    secondary="$(./wallpaper_scripts/default-secondary.sh)"
-else
-    if [ -f "./wallpaper_scripts/$secondary.sh" ]; then
-        secondary="$(./wallpaper_scripts/"$secondary".sh)"
-    fi
+if [ -f "./wallpaper_scripts/$secondary.sh" ]; then
+    secondary="$(./wallpaper_scripts/"$secondary".sh)"
 fi
 
 
 if [ "$WAYLAND_DISPLAY" ]; then
-    if [ "$XDG_CURRENT_DESKTOP" = "sway:wlroots" ]; then
+    # if [ "$XDG_CURRENT_DESKTOP" = "sway:wlroots" ]; then
         PID=$(pidof swaybg)
         swaybg -o HDMI-A-1 -i "$primary" -m fill -o DP-1 -i "$secondary" -m fill &
         sleep 0.4s
         kill "$PID"
-    else
-        current_wal="$(hyprctl hyprpaper listactive | grep HDMI-A-1 | sed 's/HDMI-A-1 = //')"
-        hyprctl hyprpaper preload "$primary"
-        hyprctl hyprpaper wallpaper "HDMI-A-1,$primary"
-        if [ $unload = 1 ]; then
-            hyprctl hyprpaper unload "$current_wal"
-        fi
-
-        current_wal="$(hyprctl hyprpaper listactive | grep DP-1 | sed 's/DP-1 = //')"
-        hyprctl hyprpaper preload "$secondary"
-        hyprctl hyprpaper wallpaper "DP-1,$secondary"
-        if [ $unload = 1 ]; then
-            hyprctl hyprpaper unload "$current_wal"
-        fi
-    fi
+    # else
+    #     current_wal="$(hyprctl hyprpaper listactive | grep HDMI-A-1 | sed 's/HDMI-A-1 = //')"
+    #     hyprctl hyprpaper preload "$primary"
+    #     hyprctl hyprpaper wallpaper "HDMI-A-1,$primary"
+    #     if [ $unload = 1 ]; then
+    #         hyprctl hyprpaper unload "$current_wal"
+    #     fi
+    #     
+    #     current_wal="$(hyprctl hyprpaper listactive | grep DP-1 | sed 's/DP-1 = //')"
+    #     hyprctl hyprpaper preload "$secondary"
+    #     hyprctl hyprpaper wallpaper "DP-1,$secondary"
+    #     if [ $unload = 1 ]; then
+    #         hyprctl hyprpaper unload "$current_wal"
+    #     fi
+    # fi
 else
     if [ -z "$1" ]; then
-        nitrogen --head=0 --set-zoom-fill "$primary"
-
-        nitrogen --head=1 --set-zoom-fill "$secondary"
+        feh --bg-fill "$primary" --bg-fill "$secondary"
     fi
 fi
diff --git a/wallpaper_scripts/default-primary.sh b/wallpaper_scripts/default-primary.sh
deleted file mode 100755
index 2898bfb..0000000
--- a/wallpaper_scripts/default-primary.sh
+++ /dev/null
@@ -1 +0,0 @@
-echo "/home/iceyrazor/stuff/media/wallpapers/4500025-retrowave-vaporwave-car-typography-purple-blue-chromatic-aberration-initial-d-hachi-roku.jpg"
diff --git a/wallpaper_scripts/default-secondary.sh b/wallpaper_scripts/default-secondary.sh
deleted file mode 100755
index f2f5ee1..0000000
--- a/wallpaper_scripts/default-secondary.sh
+++ /dev/null
@@ -1 +0,0 @@
-echo "/home/iceyrazor/stuff/media/wallpapers/tumblr_06bbd355f3e355049446dac24f6e7c44_2c486f77_1280 ninesols.jpg"
diff --git a/wallpaper_scripts/exo.sh b/wallpaper_scripts/exo.sh
new file mode 100755
index 0000000..e63351b
--- /dev/null
+++ b/wallpaper_scripts/exo.sh
@@ -0,0 +1 @@
+echo "/home/iceyrazor/stuff/media/wallpapers/labirhin-fan-exoworo-pink.jpg"