7 files changed, 29 insertions, 32 deletions

diff --git a/bin/.local/bin/fetch b/bin/.local/bin/fetch
index 93d7fc7..05cb71e 100755
--- a/bin/.local/bin/fetch
+++ b/bin/.local/bin/fetch
@@ -1,15 +1,15 @@
 #!/bin/sh
 #
-# ufetch-gentoo - tiny system info for gentoo
+# ufetch-void - tiny system info for void
 
 ## INFO
 
 # user is already defined
 host="$(hostname)"
-os='Gentoo Linux'
+os='Void Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
-packages="$(ls -d /var/db/pkg/*/* | wc -l)"
+packages="$(xbps-query -l | wc -l)"
 shell="$(basename "$SHELL")"
 
 ## UI DETECTION
@@ -54,23 +54,23 @@ if [ -x "$(command -v tput)" ]; then
 fi
 
 # you can change these
-lc="${reset}${bold}${magenta}"      # labels
-nc="${reset}${bold}${magenta}"      # user and hostname
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
 ic="${reset}"                       # info
-c0="${reset}${bold}${magenta}"      # first color
-c1="${reset}${magenta}"             # second color
+c0="${reset}${bold}${green}"        # first color
+c1="${reset}${green}"               # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}    .-----.      ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}  .\`    _  \`.    ${lc}OS:        ${ic}${os}${reset}
-${c0}  \`.   (${c1}_)   ${c0}\`.  ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}    \`${c1}.        /  ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c1}   .\`       .\`   ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c1}  /       .\`     ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}  \____.-\`       ${lc}${uitype}:        ${ic}${ui}${reset}
+${c0}      _______      ${nc}${USER}${ic}@${nc}${host}${reset}
+${c1}      ${c0}\_____ \`-    ${lc}OS:        ${ic}${os}${reset}
+${c1}   /\   ${c0}___ \`- \   ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c1}  | |  ${c0}/   \  | |  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c1}  | |  ${c0}\___/  | |  ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c1}   \ \`-_____  ${c0}\/   ${lc}SHELL:     ${ic}${shell}${reset}
+${c1}    \`-______\      ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
 
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 00c97d1..70afbc5 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -4,6 +4,7 @@ sxhkd &
 dunst &
 unclutter &
 compton &> /dev/null &
+xss-lock -- ~/.local/bin/lock &
 ~/.local/bin/bat_check.sh &
 redshift -l 13.082680:80.270718 &
 ~/.fehbg &
@@ -18,7 +19,7 @@ bspc config split_ratio          0.52
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
-bspc rule -a firefox desktop='^2'
+bspc rule -a Firefox desktop='^2'
 bspc rule -a Spacefm desktop='^4'
 
 $HOME/.config/polybar/launch.sh &
diff --git a/compton/.config/compton.conf b/compton/.config/compton.conf
index 09e44e6..6c99fcc 100644
--- a/compton/.config/compton.conf
+++ b/compton/.config/compton.conf
@@ -1,8 +1,8 @@
 ## SHADOWS
 shadow = true; 
 shadow-radius = 0.5;
-shadow-offset-x = 1;
-shadow-offset-y = 1;
+shadow-offset-x = 3;
+shadow-offset-y = 3;
 shadow-opacity = 0.65;
 log-level = "warn";
 shadow-exclude = [
@@ -15,7 +15,7 @@ shadow-exclude = [
     "name = 'Polybar tray window'",
     "class_g ?= 'Rofi'",
     "class_g ?= 'dwm'",
-    "class_g = 'firefox' && argb",
+    "class_g = 'Firefox' && argb",
     "_GTK_FRAME_EXTENTS@:c"
 ];
 
@@ -36,7 +36,7 @@ blur-background-exclude = [
 opacity-rule = [ 
     "40:class_g = 'Bspwm' && class_i = 'presel_feedback'",
     "100:class_g = 'URxvt' && focused",
-    "85:class_g = 'URxvt' && !focused"
+    "95:class_g = 'URxvt' && !focused"
 ];
 
 ## FADING
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 7e4e7e5..bb61b5a 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -32,7 +32,7 @@ padding-right = 2
 module-margin-left = 1.5
 module-margin-right = 1.5
 font-0 = Hermit:style=medium:size=9;1
-modules-left = alsa battery date time bspwm
+modules-left = pulseaudio battery date time bspwm
 modules-center = 
 modules-right = cmus
 tray-position = right
@@ -129,8 +129,8 @@ format-discharging = <label-discharging>
 format-full = <label-full>
 format-charging = <label-charging>
 
-[module/alsa]
-type = internal/alsa
+[module/pulseaudio]
+type = internal/pulseaudio
 format-volume = vol <label-volume>
 label-volume = %percentage%%
 label-muted = muted
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 0e75a4d..f0dd564 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -162,6 +162,6 @@ XF86Audio{Play,Next,Prev}
 
 #light
 XF86MonBrightnessDown
-    sudo sh -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+    sudo bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
 XF86MonBrightnessUp
-    sudo sh -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+    sudo bash -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
diff --git a/x/.Xresources b/x/.Xresources
index 19989f4..d544342 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -16,7 +16,7 @@ URxvt.scrollTtyKeypress: true
 URxvt.font: xft:Hermit:pixelsize=12:style=medium:antialias=true
 URxvt.boldFont: xft:Hermit:pixelsize=12:style=bold:antialias=true
 URxvt.italicFont: xft:Hermit:pixelsize=12:style=italic:antialias=true
-!URxvt.letterSpace: 1
+URxvt.letterSpace: 1
 urxvt*termName: rxvt
 urxvt*scrollBar: false
 urxvt*matcher.button: 1
@@ -26,20 +26,15 @@ Xft*dpi: 96
 Xft*antialias: true
 Xft*hinting: true
 Xft*hintstyle: hintfull
-URxvt*cursorUnderline:  true
+Xft.lcdfilter: lcddefault
 Xft*rgba: rgb
+URxvt*cursorUnderline:  true
 URxvt*geometry: 85x20
 *internalBorder: 15
 URxvt*fading: 0
 URxvt*tintColor: #ffffff
 URxvt*shading: 0
 URxvt*inheritPixmap: False
-Xft.autohint: 0
-Xft.lcdfilter: lcddefault
-Xft.hintstyle: hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb
 
 ! special
 *.foreground:   #c6c8d1
diff --git a/x/.xinitrc b/x/.xinitrc
index 199888c..f47d787 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -62,3 +62,4 @@ if [ "$2" = "nvidia" ]; then
 fi
 xsetroot -cursor_name left_ptr
 exec dbus-launch --exit-with-session bspwm
+#exec bspwm