@@ -50,7 +50,7 @@ source ~/.bash/prompt
 
 # z
 export _Z_CMD="j"
-[[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh
+source ~/leet/z/z.sh
 
 # title
 #trap 'echo -ne "\033]0;$BASH_COMMAND\007"' DEBUG

@@ -46,7 +46,7 @@ rootornot() {
     if [[ "$(id -u)" -eq 0 ]]; then
         echo -ne "\001${red}\002#\001${rst}\002"
     else
-        echo -ne "▴"
+	    echo -ne ";"
     fi
 }
 

@@ -45,7 +45,7 @@ export wm
 }
 
 pkgs() {
-    pkgs=$(apk info | wc -l)
+    pkgs=$(xbps-query -l | wc -l)
     export pkgs
 }
 
@@ -79,8 +79,8 @@ #printf "%s%b" "$PADC" "╋╋╋┗━┻┛\n\n"
 
 #printf "%s%b" "$PADC" "$COLOR_BARS\n\n"
 printf "%s%b" "$PADC" "${CYN}$user${RST}@${CYN}$host${RST}\n"
-printf "%s%b" "$PADC" "os:               ${CYN}$os${RST}\n"
-printf "%s%b" "$PADC" "kernel:${CYN}$kernel${RST}\n"
+printf "%s%b" "$PADC" "os:                 ${CYN}$os${RST}\n"
+printf "%s%b" "$PADC" "kernel:         ${CYN}$kernel${RST}\n"
 printf "%s%b" "$PADC" "pkgs:                ${CYN}$pkgs${RST}\n"
 printf "%s%b" "$PADC" "wm:                   ${CYN}$wm${RST}\n"
 printf "%s%b" "$PADC" "shell:              ${CYN}$shell${RST}\n"

@@ -7,19 +7,18 @@ while getopts idq options
 do
 	case $options in
 		i)
-			amixer sset Master 2%+
+			pamixer -i 2
 			;;
 
 		d)
-			amixer sset Master 2%-
+			pamixer -d 2
 			;;
 		q)
-			if [[ $(amixer get Master | awk -F"[][] " '{ print $3 }' | tr -d '\n') = "[on]" ]]
-			then
-				cur_vol=$(amixer get Master | awk -F"[][]" '/dB/ { print $2 }' | tr -d '\n')
-				echo -ne "%{F$light}vol %{F$fg}$cur_vol"
+			cur_vol=$(pamixer --get-volume-human)
+            if [[ "$cur_vol" == "muted" ]]; then
+				echo -ne "%{F$light}vol %{F$fg}muted"
 			else
-				echo -ne "%{F$light}vol %{F$fg}muted"
+			    echo -ne "%{F$light}vol %{F$fg}$cur_vol"
 			fi
 			;;
 	esac

@@ -1,5 +1,5 @@ 
 [global]
-    font = SF Mono Semibold 12
+    font = Roboto Mono Medium 14
     allow_markup = yes
     plain_text = no
     format = "%s\n%b"

@@ -179,9 +179,9 @@ # rofi-pass
 bindsym $mod+p exec "rofi-pass"
 
 # volume controls
-bindsym XF86AudioRaiseVolume exec amixer sset Master 2%+
-bindsym XF86AudioLowerVolume exec amixer sset Master 2%-
-bindsym XF86AudioMute exec amixer sset Master toggle
+bindsym XF86AudioRaiseVolume exec pamixer -i 2
+bindsym XF86AudioLowerVolume exec pamixer -d 2
+bindsym XF86AudioMute exec pamixer -t
 
 # brightness controls
 bindsym XF86MonBrightnessUp exec xbacklight -inc 5