2 files changed, 18 insertions, 13 deletions

diff --git a/spectrwm/.config/spectrwm/spectrwm.conf b/spectrwm/.config/spectrwm/spectrwm.conf
index 62709ad..87efc30 100644
--- a/spectrwm/.config/spectrwm/spectrwm.conf
+++ b/spectrwm/.config/spectrwm/spectrwm.conf
@@ -38,8 +38,8 @@ bar_color[1]		= black
 bar_color_selected[1]   = rgb:00/80/80
 bar_font_color[1]       = rgb:b5/b5/b5, rgb:73/73/73
 bar_font_color_selected = black
-bar_font                = Hermit:size=9
-bar_action              = ~/.local/bin/statusbar
+bar_font                = Hermit:size=9.5
+bar_action              = ~/.config/spectrwm/statusbar
 bar_action_expand = 1
 bar_justify             = left
 #bar_format             = +N:+I +S <+D>+4<%a %b %d %R %Z %Y+8<+4<+V
@@ -66,10 +66,9 @@ urgent_enabled		= 1
 # region                = screen[1]:1280x1024+1280+0
 
 # Launch applications in a workspace of choice
-autorun                 = ws[1]:urxvtd
 autorun                 = ws[1]:~/.fehbg
 autorun                 = ws[1]:picom
-autorun                 = ws[2]:firefox
+autorun                 = ws[2]:firefox-bin
 autorun                 = ws[1]:~/bin/xss
 autorun                 = ws[1]:~/.local/bin/bat_check.sh
 
@@ -101,14 +100,17 @@ keyboard_mapping = ~/.config/spectrwm/keybindings.conf
 
 # Validated default programs:
 program[lock]           = xset s activate
-program[term]           = urxvtc
+program[term]           = st
 program[menu]           = ~/bin/menu
-program[bup]            = sudo bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
-program[bdown]          = sudo bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+program[bup]            = doas bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+program[bdown]          = doas bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
 program[soundinc]    = pulsemixer --change-volume +5
 program[sounddec]    = pulsemixer --change-volume -5
 program[soundmute]   = pulsemixer --toggle-mute
 program[shut]   = ~/.local/bin/shut
+program[pnext]  = cmus-remote -n
+program[pprev]  = cmus-remote -r
+program[pplay]  = cmus-remote -u
 # program[search]       = dmenu $dmenu_bottom -i -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_color_selected -sf $bar_font_color_selected
 # program[name_workspace]       = dmenu $dmenu_bottom -p Workspace -fn $bar_font -nb $bar_color -nf $bar_font_color -sb $bar_color_selected -sf $bar_font_color_selected
 
@@ -122,6 +124,9 @@ bind[soundinc]      = XF86AudioRaiseVolume
 bind[sounddec]      = XF86AudioLowerVolume
 bind[soundmute]     = XF86AudioMute
 bind[shut]     = MOD+x
+bind[pnext]         = XF86AudioNext
+bind[pprev]         = XF86AudioPrev
+bind[pplay]         = XF86AudioPlay
 
 # Optional default programs that will only be validated if you override:
 program[screenshot_all] = screenshot full       # optional
diff --git a/x/.xinitrc b/x/.xinitrc
index 66ae948..d87cc5d 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -2,10 +2,10 @@
 #.xinitrc
 xset b off &
 xset s 600 &
-~/bin/xss &
-~/.fehbg &
-~/bin/batcheck &
-picom 2>/dev/null &
-dwmbar &
+# ~/bin/xss &
+# ~/.fehbg &
+# ~/bin/batcheck &
+# picom 2>/dev/null &
+# dwmbar &
 
-exec dbus-launch --exit-with-session startdwm
+exec dbus-launch --exit-with-session spectrwm