salt/home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bspwm: Change logging prefixes, add fallbacks for wallpaper setting

Browse Source
This commit is contained in:
Salt 2018-07-31 13:14:36 -05:00
parent 922ae91986
commit 8b984f2779
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
.config/bspwm/bspwmrc
View File

@ -26,29 +26,29 @@ unset PB_MONITOR
## Patch path, if not already done ## Patch path, if not already done
if [[ "$PATH" != "*$HOME/.local/bin*" ]]; then if [[ "$PATH" != "*$HOME/.local/bin*" ]]; then
printf "[..] Patching path for $HOME/.local/bin\n" printf "[INFO] Patching path for $HOME/.local/bin\n"
export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/bin:$PATH"
fi fi
## Load device-specific scripts ## Load device-specific scripts
if [[ -x ".config/bspwm/$(hostname).rc" ]]; then if [[ -x ".config/bspwm/$(hostname).rc" ]]; then
printf "[..] Sourcing .config/bspwm/$(hostname).rc\n" printf "[INFO] Sourcing .config/bspwm/$(hostname).rc\n"
source .config/bspwm/$(hostname).rc source .config/bspwm/$(hostname).rc
fi fi
## bspwm GENERAL CONFIGURATION ## bspwm GENERAL CONFIGURATION
printf "[..] Setting up monitors\n" printf "[INFO] Setting up monitors\n"
monitors=$(bspc query -M | wc -l) monitors=$(bspc query -M | wc -l)
desktops=8 desktops=8
deskpermon=$(expr $desktops / $monitors) deskpermon=$(expr $desktops / $monitors)
i=1 i=1
printf " [..] Putting $desktops desktops across $monitors monitors, $deskpermon each\n" printf " [INFO] Putting $desktops desktops across $monitors monitors, $deskpermon each\n"
for monitor in $(bspc query -M); do for monitor in $(bspc query -M); do
until [[ "$(expr $i % \( $deskpermon + 1 \))" == "0" ]]; do until [[ "$(expr $i % \( $deskpermon + 1 \))" == "0" ]]; do
layout="$layout $i" layout="$layout $i"
i=$(expr $i + 1) i=$(expr $i + 1)
done done
printf " [..] Giving monitor $monitor layout $layout\n" printf " [INFO] Giving monitor $monitor layout $layout\n"
bspc monitor $monitor -d $layout bspc monitor $monitor -d $layout
layout="$i" layout="$i"
i=$(expr $i + 1) i=$(expr $i + 1)
@ -58,7 +58,7 @@ unset monitors
unset desktops unset desktops
unset deskpermon unset deskpermon
printf "[..] Configuring bspwm\n" printf "[INFO] Configuring bspwm\n"
bspc config border_width 4 bspc config border_width 4
bspc config window_gap 6 bspc config window_gap 6
@ -80,7 +80,7 @@ bspc config active_border_color "#a0a0a0"
bspc config focused_border_color "#83a598" bspc config focused_border_color "#83a598"
bspc config presel_feedback_color "#9b9b9b" bspc config presel_feedback_color "#9b9b9b"
printf "[..] Setting window rules\n" printf "[INFO] Setting window rules\n"
## bspwm WINDOW RULES ## bspwm WINDOW RULES
bspc rule -r '*' bspc rule -r '*'
bspc rule -a Waterfox desktop=1 bspc rule -a Waterfox desktop=1
@ -91,7 +91,7 @@ bspc rule -a 'Minecraft 1.7.10' state=fullscreen
bspc rule -a plasmashell state=floating sticky=on border=off bspc rule -a plasmashell state=floating sticky=on border=off
bspc rule -a krunner state=floating layer=above sticky=on border=off bspc rule -a krunner state=floating layer=above sticky=on border=off
printf "[..] Performing simple configuration\n" printf "[INFO] Performing simple configuration\n"
## SIMPLE CONFIGURATION ## SIMPLE CONFIGURATION
xset -b xset -b
xset -dpms xset -dpms
@ -100,31 +100,46 @@ xset s off
xrdbupdate xrdbupdate
## SERVICES AND DAEMONS ## SERVICES AND DAEMONS
feh --randomize --bg-fill ~/Pictures/Wallpapers/.active & printf "[INFO] Killing existing daemons\n"
printf "[..] Killing existing daemons\n"
services="sxhkd polybar conky dunst compton" services="sxhkd polybar conky dunst compton"
for service in $services; do for service in $services; do
printf " [..] Killing $service\n" printf " [INFO] Killing $service\n"
killall $service killall $service
done done
# Wallpaper management
# Note that this MUST happen before the compositor starts, otherwise xsetroot
# will not apply properly
if which xfdesktop; then
printf "[INFO] Starting xfdesktop\n"
xfdesktop&
elif which feh; then
printf "[INFO] Setting wallpaper with feh\n"
printf "[WARN] This solution may cause problems on multi-monitor systems\n"
feh --randomize --bg-fill ~/Pictures/Wallpapers/.active &
elif which xsetroot; then
printf "[INFO] Setting root window color\n"
xsetroot -solid "#282828"
else
printf "[WARN] Could not find any wallpaper manager\n"
fi
# Don't start the compositor in a VM # Don't start the compositor in a VM
if [[ $(hostname) != "vm"* ]]; then if [[ $(hostname) != "vm"* ]]; then
printf " [..] Starting compton\n" printf " [INFO] Starting compton\n"
compton & compton &
fi fi
# Different startup for OpenBSD and Linux # Different startup for OpenBSD and Linux
if [[ $(uname) == "Linux" ]]; then if [[ $(uname) == "Linux" ]]; then
printf "[..] Starting Linux tasks\n" printf "[INFO] Starting Linux tasks\n"
compton & compton &
$HOME/.config/polybar/start.sh & $HOME/.config/polybar/start.sh &
sxhkd & sxhkd &
else else
printf "[..] Starting OpenBSD tasks\n" printf "[INFO] Starting OpenBSD tasks\n"
sxhkd -c $XDG_CONFIG_HOME/sxhkd/sxhkdrc-obsd & sxhkd -c $XDG_CONFIG_HOME/sxhkd/sxhkdrc-obsd &
fi fi
# Start these all the time regardless of platform # Start these all the time regardless of platform
printf "[..] Starting platform-independent tasks\n" printf "[INFO] Starting platform-independent tasks\n"
conky& conky&
dunst& dunst&
printf "[..] Finished initialization\n" printf "[INFO] Finished initialization\n"