Merge pull request #1 from LukeSmithxyz/master

updating...

.cache/bg

@@ -0,0 +1 @@
+../.config/wall.png

.config/i3/config

@@ -81,7 +81,7 @@ bindsym $mod+Shift+r		exec --no-startup-id winresize
 bindsym $mod+t			split toggle
 bindsym $mod+Shift+t		gaps inner current set $inner_gaps; gaps outer current set $outer_gaps
 
-bindsym $mod+y			exec $term -e calcurse -D ~/.config/calcurse
+bindsym $mod+y			exec $term -e calcurse
 bindsym $mod+Shift+y		exec --no-startup-id i3resize left
 
 bindsym $mod+u			exec --no-startup-id ddspawn tmuxdd

.config/sxhkd/sxhkdrc

@@ -21,7 +21,7 @@ super + m
 super + n
 	$TERMINAL -e newsboat
 super + c
-	$TERMINAL -e calcurse -D ~/.config/calcurse
+	$TERMINAL -e calcurse
 super + v
 	$TERMINAL -e nvim -c VimwikiIndex
 super + shift + a

.config/wal/postrun

@@ -24,5 +24,6 @@ done
 
 fix_sequences <"${HOME}/.cache/wal/sequences"
 
+xsetroot -name "fsignal:xrdb"
 pkill dunst
 dunst &

.local/bin/setbg

@@ -1,22 +1,19 @@
 #!/bin/sh
 
-# In LARBS, ~/.config/wall.png is the location of the system wallpaper.  This
-# script, if given an argument, moves it there.  This script without an
-# argument sets ~/.config/wall.png as the wallpaper, which is required on login
-# if you don't want a black screen.
-#
-# You may also give a directory name to select a random image from that
-# directory as a wallpaper. Be careful that the directory only has images.
+# This script does the following:
+#	Run by itself, set the wallpaper (at X start).
+#	If given a file, set that as the new wallpaper.
+#	If given a directory, choose random file in it.
+#	If wal is installed, also generate a colorscheme.
 
-[ -f "$1" ] && cp "$1" ~/.config/wall.png && notify-send -i "$HOME/.config/wall.png" "Wallpaper changed."
+# Location of link to wallpaper link.
+bgloc="${XDG_CACHE_HOME:-$HOME/.cache/}/bg"
 
-[ -d "$1" ] && cp "$(find "$1" -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -type f | shuf -n 1)" ~/.config/wall.png && notify-send -i "$HOME/.config/wall.png" "Random Wallpaper chosen."
+[ -f "$1" ] && ln -sf "$(readlink -f "$1")" "$bgloc" && notify-send -i "$bgloc" "Changing wallpaper..."
+
+[ -d "$1" ] && ln -sf "$(find "$(readlink -f "$1")" -iregex '.*.\(jpg\|jpeg\|png\|gif\)' -type f | shuf -n 1)" "$bgloc" && notify-send -i "$bgloc" "Random Wallpaper chosen."
 
 # If pywal is installed, use it.
-type wal >/dev/null 2>&1 && { wal -c
-	wal -s -i ~/.config/wall.png -o ~/.config/wal/postrun
-	xsetroot -name "fsignal:xrdb"
-	killall dwmblocks
-	setsid dwmblocks >/dev/null & } >/dev/null 2>&1
+wal -s -i "$(readlink -f "$bgloc")" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1
 
-xwallpaper --zoom ~/.config/wall.png
+xwallpaper --zoom "$bgloc"

.local/bin/statusbar/clock

@@ -3,7 +3,7 @@
 date '+%Y %b %d (%a) %I:%M%p'
 
 case $BLOCK_BUTTON in
-	1) pgrep -x dunst >/dev/null && notify-send "This Month" "$(cal --color=always | sed "s/..7m/<b><span color=\"red\">/;s/..27m/<\/span><\/b>/")" && notify-send "Appointments" "$(calcurse -D ~/.config/calcurse -d3)" ;;
+	1) pgrep -x dunst >/dev/null && notify-send "This Month" "$(cal --color=always | sed "s/..7m/<b><span color=\"red\">/;s/..27m/<\/span><\/b>/")" && notify-send "Appointments" "$(calcurse -d3)" ;;
 	2) $TERMINAL -e calcurse -D ~/.config/calcurse ;;
 	3) pgrep -x dunst >/dev/null && notify-send "📅 Time/date module" "\- Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\`
 - Middle click opens calcurse if installed" ;;