4 files changed, 10 insertions, 12 deletions
diff --git a/Scripts/.config/Scripts/autostart.sh b/Scripts/.config/Scripts/autostart.sh
index e721c09..2547037 100755
--- a/Scripts/.config/Scripts/autostart.sh
+++ b/Scripts/.config/Scripts/autostart.sh
@@ -13,9 +13,9 @@ function run {
 #~/.config/Scripts/screen.sh d && sleep 2s
 setxkbmap -layout us -variant altgr-intl -option caps:escape
 xmodmap -e "keycode 135 = Super_R"
+setxkbmap -option caps:escape
 xset s off -dpms
 run dunst
-run mpd
 run nm-applet
 run compton
 setbg ~/.config/wall.png
@@ -23,14 +23,15 @@ setbg ~/.config/wall.png
 FEDORA=$(hostnamectl | grep -qw Fedora && echo $?)
 if [ "$FEDORA" == 0 ];
 then
-    xinput --set-prop "Synaptics TM3276-031" "Device Enabled" 0
-    run vivaldi-stable
+    xinput --set-prop "Synaptics TM3276-022" "Device Enabled" 0
+    run vivaldi
     run light-locker
 else
     synclient TouchpadOff=1
     run /usr/bin/xflux -l 43.6404 -g -79.3995
     run st -c email -e neomutt
     run brave
+    run mpd
 fi
 
 run keepassxc
@@ -44,5 +45,5 @@ then
 else
   run ~/.config/Scripts/launch_polybar.sh
   run st -c dropdown -e tmux -f ~/.config/tmux/tmux_start.conf attach
-  run st -c math -e R
+  run st -c math -e bc
 fi
diff --git a/Scripts/.config/Scripts/lock.sh b/Scripts/.config/Scripts/lock.sh
index dee89b4..4768dd2 100755
--- a/Scripts/.config/Scripts/lock.sh
+++ b/Scripts/.config/Scripts/lock.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-#scrot /tmp/screen.png
-#convert /tmp/screen.png -paint 3 /tmp/screen.png
-#[[ -f ~/.config/lock.png ]] && convert /tmp/screen.png  ~/.config/lock.png -gravity center -composite -matte /tmp/screen.png
-#mocp -P
-#i3lock -u -e -i /tmp/screen.png
+maim --hidecursor --window $(xdotool getactivewindow) /tmp/wall.png
+convert /tmp/wall.png -paint 3 /tmp/wall.png
 
-light-locker-command -l
+light-locker-command --lock
diff --git a/Scripts/.config/Scripts/setbg b/Scripts/.config/Scripts/setbg
index 1084471..62457d6 100755
--- a/Scripts/.config/Scripts/setbg
+++ b/Scripts/.config/Scripts/setbg
@@ -15,4 +15,4 @@ WALLPAPER_HOME="$HOME/.config/wall.png"
 [ -d "$1" ] && cp -f "$(find "$1" -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -type f | shuf -n 1)" "$WALLPAPER_HOME" && notify-send -i "$WALLPAPER_HOME" "Random Wallpaper chosen."
 
 # If pywal is installed, use it.
-wal -c && wal -o $HOME/.config/Scripts/done.sh -i "$WALLPAPER_HOME"
+/usr/local/bin/wal -c && /usr/local/bin/wal -o $HOME/.config/Scripts/done.sh -i "$WALLPAPER_HOME"
diff --git a/Scripts/.config/Scripts/wp b/Scripts/.config/Scripts/wp
index 05dcfb4..29789cc 100755
--- a/Scripts/.config/Scripts/wp
+++ b/Scripts/.config/Scripts/wp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-find $HOME/Pictures/wallpapers -type f | shuf | sxiv -
+find $HOME/wallpapers -type f | shuf | sxiv -