From 5194b7f903dbceec45dc843b40e4508f9cffd480 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 19 Sep 2021 12:22:19 +0200 Subject: [PATCH 1/4] feat: update aliases remove university aliases for SSH customize unimatrix (cyan -> green) --- .config/aliasrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/aliasrc b/.config/aliasrc index 167d846..4109601 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -2,6 +2,8 @@ # sourced at launch alias cp='cp -v' +alias mv='mv -v' +alias rm='rm -v' alias grep='grep --color=auto' alias ls='ls --color=auto' alias ll='ls -lh' @@ -10,12 +12,10 @@ alias bulkrename='\ls | $EDITOR - -c ":%s/.*/mv -i & &/g"' alias backup='rsync -aAXv --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} /' alias printenv='printenv | sort' alias gu='git fetch upstream && git merge upstream/master' -alias unimatrix='unimatrix -a -f -c=cyan -s=95' +alias unimatrix='unimatrix -a -f -s=95' alias untar='tar -zxvf' alias root@site='ssh root@davidjulien.xyz' alias swytch@site='ssh swytch@davidjulien.xyz' -alias @webapps='ssh p1926178@192.168.75.57' -alias @projet='ssh p1926178@192.168.74.198' alias dotfiles='/usr/bin/git --git-dir=$DOTFILES --work-tree=$HOME' alias abcde='abcde -c $XDG_CONFIG_HOME/abcde/config' alias abook='abook --config $XDG_CONFIG_HOME/abook/abookrc --datafile "$XDG_DATA_HOME"/abook/addressbook' From 7c0ffbf9532db9ac84e6241046d24e66b5d625b3 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 19 Sep 2021 12:29:02 +0200 Subject: [PATCH 2/4] feat: display song artist, not album artist --- .local/bin/statusbar/sb-music | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/bin/statusbar/sb-music b/.local/bin/statusbar/sb-music index 0202cb8..a60adff 100755 --- a/.local/bin/statusbar/sb-music +++ b/.local/bin/statusbar/sb-music @@ -13,7 +13,7 @@ unicode() { sed "s/[‘’]/'/g;s/[“”]/\"/g"; } format() { sed "s/^volume:n\/a.*//g;/^volume:/d;s/\\&/&/g;s/\\[paused\\].*//g;s/\\[playing\\].*//g"; } -mpc="$(mpc --format "%albumartist% - %title%")" +mpc="$(mpc --format "%artist% - %title%")" title="$(echo "$mpc" | head -n1 | cut -d'-' -f2 | unicode)" [ "$(echo "$title" | wc -c)" -gt 18 ] && title="$(printf "%.15s..." "$title")" artist="$(echo "$mpc" | head -n1 | cut -d'-' -f1 | unicode)" From c2f0fa4e6a50a13a0264e1f87959aece465ab389 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 19 Sep 2021 12:30:30 +0200 Subject: [PATCH 3/4] feat: do not compute wifi strength only display ssid tweak wifi tests --- .local/bin/statusbar/sb-internet | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet index 0b47f56..def21ed 100755 --- a/.local/bin/statusbar/sb-internet +++ b/.local/bin/statusbar/sb-internet @@ -11,9 +11,10 @@ # Wifi quality percentage and  icon if ethernet is connected. -wifi="$(grep "^\s*w" /proc/net/wireless | awk '{ printf int($3 * 100 / 70) }')" -[ $wifi -ne 0 ] && str="$(printf "直 %3d%%" $wifi)" || str="$(printf "睊")" -eth="$(cat /sys/class/net/eno1/operstate)" +ssid="$(wpa_cli status | grep -i ^ssid | sed -e 's/.*=//')" +state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')" +[ "COMPLETED" = $state ] && str="$(printf " %s" $ssid)" || str="$(printf " ---")" +eth="$(cat /sys/class/net/enp0s31f6/operstate)" if [ "up" = "$eth" ]; then str="$(printf "%s /  " "$str")" fi From 3cef4855a41004937e33678a773c84f7ce93a6d4 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 19 Sep 2021 12:32:33 +0200 Subject: [PATCH 4/4] feat: update battery actions notify when total of batteries is > 40 display battery slots --- .local/bin/statusbar/sb-battery | 39 +++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/.local/bin/statusbar/sb-battery b/.local/bin/statusbar/sb-battery index b164339..18d534b 100755 --- a/.local/bin/statusbar/sb-battery +++ b/.local/bin/statusbar/sb-battery @@ -25,9 +25,9 @@ notify() { \ fi [ 300 -gt $delta ] && return; echo $now > $XDG_CONFIG_HOME/batteryupdate - case "$capacity" in - 1[0-9]) notify-send -u "normal" "Battery is running low ($capacity%)" "Please plug your computer to a power source" ;; - [0-9]) notify-send -u "critical" "Battery is dangerously low ($capacity%)" "Please plug your computer to a power source - NOW!" ;; + case "$total" in + [2-3][0-9]) notify-send -u "normal" "Battery is running low ($capacity%)" "Please plug your computer to a power source" ;; + *) notify-send -u "critical" "Battery is dangerously low ($capacity%)" "Please plug your computer to a power source - NOW!" ;; esac } @@ -35,19 +35,24 @@ for bat in /sys/class/power_supply/BAT?/ do status="$(cat "$bat/status")" capacity="$(cat "$bat/capacity")" - if [ "$status" = "Full" ]; then + total="$(expr $total + $capacity)" + slot="$(basename $bat)" + if [ "Full" = "$status" ]; then status=" " && capacity="FULL" - printf " %s %s " "$status" "$capacity" && exit - elif [ "$status" = "Charging" ]; then - status="" - else - case "$capacity" in - 100|[8-9][0-9]) status="" ;; - [6-7][0-9]) status="" ;; - [4-5][0-9]) status="" ;; - [2-3][0-9]) status="" ;; - *) status="" ; notify;; - esac - fi - printf " %s %3d%% " "$status" "$capacity"; + printf " %s:%s(%s) " "$slot" "$status" "$capacity" + else + if [ "$status" = "Charging" ]; then + status="" + else + case "$capacity" in + 100|[8-9][0-9]) status="" ;; + [6-7][0-9]) status="" ;; + [4-5][0-9]) status="" ;; + [2-3][0-9]) status="" ;; + *) status="" ;; + esac + [ 40 -gt $total ] && notify; + fi + printf " %s:%s (%0.2d%%) " "$slot" "$status" "$capacity"; + fi done