From ef80d981bf21e3b23bf95e2ca38a50524b518762 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Thu, 14 Apr 2022 00:55:23 +0200 Subject: [PATCH] Huge statusbar changes, no more Material stuff. --- _suckless/_scripts/sb-battery | 10 +++++----- _suckless/_scripts/sb-emerge | 2 +- _suckless/_scripts/sb-mail | 2 +- _suckless/_scripts/sb-network | 6 +++--- _suckless/_scripts/sb-volume | 10 +++++----- _suckless/dwm/config.h | 6 +++--- _suckless/dwmblocks/blocks.h | 18 +++++++++--------- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/_suckless/_scripts/sb-battery b/_suckless/_scripts/sb-battery index d46bd56..696e5ea 100755 --- a/_suckless/_scripts/sb-battery +++ b/_suckless/_scripts/sb-battery @@ -5,11 +5,11 @@ for battery in /sys/class/power_supply/BAT?*; do [ -n "${capacity+x}" ] && printf " " # Sets up the status and capacity case "$(cat "$battery/status")" in - "Full") status="\ue1a3" ;; - "Discharging") status="\ue1a5" ;; - "Charging") status="\ue63c" ;; - "Not charging") status="\ue1a3" ;; - "Unknown") status="\ue1a6" ;; + "Full") status="\uf102" ;; + "Discharging") status="\uf078" ;; + "Charging") status="\uf077" ;; + "Not charging") status="\uf444" ;; + "Unknown") status="\uf128" ;; esac capacity=$(cat "$battery/capacity") # Will make a warn variable if discharging and low diff --git a/_suckless/_scripts/sb-emerge b/_suckless/_scripts/sb-emerge index 827fc99..1a70e69 100755 --- a/_suckless/_scripts/sb-emerge +++ b/_suckless/_scripts/sb-emerge @@ -1,3 +1,3 @@ #!/bin/bash -[ $(pgrep -x emerge) ] && printf "^c#ffffff^^b#61538d^\uea3c emerge^d^" || printf "" +[ $(pgrep -x emerge) ] && printf "^c#ffffff^^b#61538d^\ue20f emerge^d^" || printf "" diff --git a/_suckless/_scripts/sb-mail b/_suckless/_scripts/sb-mail index 95437e1..857d2a7 100755 --- a/_suckless/_scripts/sb-mail +++ b/_suckless/_scripts/sb-mail @@ -13,4 +13,4 @@ for i in $(cat ~/.local/share/passwords); do [ $count -ne 0 ] && export unread=$((unread + count)) fi done -[ "$unread" -eq 0 ] && printf "" || printf "^c#ffffff^^b#005577^\ue0e1 new mail: ${unread}^d^" +[ "$unread" -eq 0 ] && printf "" || printf "^c#ffffff^^b#005577^\uf7aa new mail: ${unread}^d^" diff --git a/_suckless/_scripts/sb-network b/_suckless/_scripts/sb-network index 5db4559..5d4aea4 100755 --- a/_suckless/_scripts/sb-network +++ b/_suckless/_scripts/sb-network @@ -1,9 +1,9 @@ #!/bin/bash case "$(cat /sys/class/net/w*/operstate 2>/dev/null)" in - down) printf "^c#ffffff^^b#770000^\ue63e no wifi^d^" ;; + down) printf "^c#ffffff^^b#770000^no wifi^d^" ;; up) [ -n "$(ip address show dev wlan0 | grep 'inet ')" ] \ - && printf "\ue63e $(iw dev wlan0 info | grep 'ssid ' | cut -d' ' -f2-)" \ - || printf "^c#ffffff^^b#770000^\ue63e no ip^d^" ;; + && printf "$(iw dev wlan0 info | grep 'ssid ' | cut -d' ' -f2-)" \ + || printf "^c#ffffff^^b#770000^no ip^d^" ;; esac diff --git a/_suckless/_scripts/sb-volume b/_suckless/_scripts/sb-volume index dea213b..332f4b2 100755 --- a/_suckless/_scripts/sb-volume +++ b/_suckless/_scripts/sb-volume @@ -17,12 +17,12 @@ else volmute=$(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') micmute=$(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') if [ "$volmute" = yes ] && [ "$micmute" = yes ]; then - printf "^c#ffffff^^b#770000^\ue02b mute \ue04f mute^d^" + printf "^c#ffffff^^b#770000^\uf131 mute | \ufa80 mute^d^" elif [ "$vol" -eq 0 ] && [ "$mic" -eq 0 ]; then - printf "^c#ffffff^^b#770000^\ue02b mute \ue04f mute^d^" + printf "^c#ffffff^^b#770000^\uf131 mute | \ufa80 mute^d^" else - [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] || [ "$vol" -eq 0 ] && volinfo="^c#ffffff^^b#770000^\ue04f mute^d^" || volinfo="\ue050 ${vol}%%" - [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && micinfo="^c#ffffff^^b#770000^\ue02b mute^d^" || micinfo="\ue029 ${mic}%%" - printf "${micinfo} ${volinfo}" + [ $(pactl get-sink-mute @DEFAULT_SINK@ | awk -F': ' '{print $2}') = yes ] || [ "$vol" -eq 0 ] && volinfo="^c#ffffff^^b#770000^\ufa80 mute^d^" || volinfo="\uf028 ${vol}%%" + [ $(pactl get-source-mute @DEFAULT_SOURCE@ | awk -F': ' '{print $2}') = yes ] || [ "$mic" -eq 0 ] && micinfo="^c#ffffff^^b#770000^\uf131 mute^d^" || micinfo="\uf130 ${mic}%%" + printf "${micinfo} | ${volinfo}" fi fi diff --git a/_suckless/dwm/config.h b/_suckless/dwm/config.h index f1fa514..fe0ec3e 100644 --- a/_suckless/dwm/config.h +++ b/_suckless/dwm/config.h @@ -13,8 +13,8 @@ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display static const int showsystray = 1; /* 0 means no systray */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const int user_bh = 20; /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */ -static const char *fonts[] = { "RobotoMono Nerd Font:style=Medium:size=10", "Material Icons:size=12" }; +static const int user_bh = 0; /* 0 means that dwm will calculate bar height, >= 1 means dwm will user_bh as bar height */ +static const char *fonts[] = { "RobotoMono Nerd Font:style=Medium:size=10" }; static const char normfgcolor[] = "#bbbbbb"; static const char col_fg[] = "#c7c7c7"; static const char col_bg[] = "#161616"; @@ -41,7 +41,7 @@ static Sp scratchpads[] = { }; /* tagging */ -static const char *tags[] = {"\ue9ef", "\ue80b", "\ue0c9", "\ue0e1", "\ue3fe", "\ue3ff", "\ue405", "\ue8af", "\ue943", "\ue894"}; +static const char *tags[] = {"\uf292", "\uf738", "\uf70d", "\uf7aa", "\ue795", "\uf120", "\ufc58", "\uf9b0", "\uf296", "\uf2bb"}; static const Rule rules[] = { /* xprop(1): diff --git a/_suckless/dwmblocks/blocks.h b/_suckless/dwmblocks/blocks.h index d1919bf..043cf3d 100644 --- a/_suckless/dwmblocks/blocks.h +++ b/_suckless/dwmblocks/blocks.h @@ -1,14 +1,14 @@ //Modify this file to change what commands output to your statusbar, and recompile using the make command. static const Block blocks[] = { - /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ - {"", "sb-emerge", 1, 0 }, - {"", "sb-mail", 180, 16 }, - {"", "sb-volume", 0, 12 }, - {"", "sb-network", 1, 0 }, - {"", "sb-battery", 3, 0 }, - {"\ue935 ", "date '+%F %I:%M:%S %p'", 1, 0 }, + /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ + {"", "sb-emerge", 1, 0 }, + {"", "sb-mail", 60, 16 }, + {"", "sb-volume", 0, 12 }, + {"\uf1eb ", "sb-network", 1, 0 }, + {"\uf241 ", "sb-battery", 3, 0 }, + {"\uf073 ", "date '+%F %I:%M:%S %p |'", 1, 0 }, }; //sets delimeter between status commands. NULL character ('\0') means no delimeter. -static char delim[] = " "; -static unsigned int delimLen = 1; +static char delim[] = " | "; +static unsigned int delimLen = 3;