From 350ea17468b27aeaf4742f02f0b1340f8ce21fc7 Mon Sep 17 00:00:00 2001 From: tavo-wasd Date: Wed, 21 Feb 2024 21:44:22 -0600 Subject: [PATCH] status --- scripts/cal | 24 +++++++++++ scripts/sway/swaystatus | 96 ++--------------------------------------- scripts/todo | 11 ----- shell/aliasrc | 1 - 4 files changed, 28 insertions(+), 104 deletions(-) create mode 100755 scripts/cal delete mode 100755 scripts/todo diff --git a/scripts/cal b/scripts/cal new file mode 100755 index 0000000..2ce75e4 --- /dev/null +++ b/scripts/cal @@ -0,0 +1,24 @@ +#!/bin/sh +FUNC="$1" +MODE="$2" + +all() { + printf "\033[1m\033[34m=== %s ===\033[0m\n%s\n" "$DATE" "$(calcurse -a -t)" +} + +apts() { + [ -z "$MODE" ] && apts="$(calcurse -a)" + [ "$MODE" = "count" ] && apts="$(calcurse -a | grep -c '\*')" + if [ "$apts" = "0" -o "$apts" = "" ] ; then return 0 ; fi + echo "󰃭 $apts" +} + +todo() { + [ -z "$MODE" ] && todo="$(calcurse -t)" + [ "$MODE" = "count" ] && todo="$(calcurse -t | wc -l)" + if [ "$todo" = "0" -o "$todo" = "" ] ; then return 0 ; fi + echo " $todo" +} + +[ -z "$FUNC" ] && all && exit 0 +$FUNC $MODE diff --git a/scripts/sway/swaystatus b/scripts/sway/swaystatus index b87b5fc..517e226 100755 --- a/scripts/sway/swaystatus +++ b/scripts/sway/swaystatus @@ -1,51 +1,6 @@ #!/bin/sh separator=" " -get_int() { # Type of interface & status - # If active ethernet, just exit with icon - grep -xq 'up' /sys/class/net/e*/operstate 2>/dev/null && echo "󰛳" && return 0 - - # If active WiFi, print link strength - if grep -xq 'up' /sys/class/net/w*/operstate 2>/dev/null ; then - strength="$(awk 'NR==3 {printf("%.0f\n",$3*10/7)}' /proc/net/wireless)" - case 1 in - $((strength >= 100)) ) bar="━━━━━━━━━━" ;; - $((strength >= 90)) ) bar="━━━━━━━━━─" ;; - $((strength >= 80)) ) bar="━━━━━━━━──" ;; - $((strength >= 70)) ) bar="━━━━━━━───" ;; - $((strength >= 60)) ) bar="━━━━━━────" ;; - $((strength >= 50)) ) bar="━━━━━─────" ;; - $((strength >= 40)) ) bar="━━━━──────" ;; - $((strength >= 30)) ) bar="━━━───────" ;; - $((strength >= 20)) ) bar="━━────────" ;; - $((strength >= 10)) ) bar="━─────────" ;; - $((strength >= 0)) ) bar="──────────" ;; - esac - echo "󰖩 $bar" - return 0 - fi - - # If down interfaces, exit with icon - grep -xq 'down' /sys/class/net/w*/operstate 2>/dev/null && echo "󰖪 ──────────" && return 0 - grep -xq 'down' /sys/class/net/e*/operstate 2>/dev/null && echo "󰲛" && return 0 -} - -get_net() { - # Run 'int' - info=$(get_int) - - # Check if a VPN is enabled - vpn="$( \ - sed "s/.*//" /sys/class/net/tun*/operstate 2>/dev/null - sed "s/.*//" /sys/class/net/wg*/operstate 2>/dev/null \ - )" - # If so, change icon - [ -n "$vpn" ] && info="$(printf "$info" | sed 's/󰛳//' | sed 's/󰖩//')" - - # Print $info - printf "%s" "$info" -} - get_vol() { vol=$(amixer | grep "Playback" | grep -o '[0-9]*[0-9]%' | head -n 1) vol="${vol%\%*}" # Remove percentage sign @@ -98,38 +53,6 @@ get_mic() { echo " $bar" } -get_bat() { - total=0 - batteries=0 - - for battery in /sys/class/power_supply/BAT?* ; do - capacity=$(cat $battery/capacity 2>/dev/null || break) - total=$((capacity+total)) - batteries=$(($batteries+1)) - done - - [ $total -gt 0 ] && bat=$(($total/$batteries)) || bat="󰚥" - [ "$bat" = "󰚥" ] && echo "$bat" && exit - grep -rq 'Charging' /sys/class/power_supply/BAT* 2>/dev/null && stat='Charging' - - case 1 in - $((bat >= 98)) ) bar="━━━━━━━━━━" ;; - $((bat >= 90)) ) bar="━━━━━━━━━─" ;; - $((bat >= 80)) ) bar="━━━━━━━━──" ;; - $((bat >= 70)) ) bar="━━━━━━━───" ;; - $((bat >= 60)) ) bar="━━━━━━────" ;; - $((bat >= 50)) ) bar="━━━━━─────" ;; - $((bat >= 40)) ) bar="━━━━──────" ;; - $((bat >= 30)) ) bar="━━━───────" ;; - $((bat >= 20)) ) bar="━━────────" ;; - $((bat >= 10)) ) bar="━─────────" ;; - $((bat >= 10)) ) bar="──────────" ;; - esac - - [ "$stat" != "Charging" ] && icon="󰁹" || icon="" - echo "$icon $bar" -} - get_layout() { layout="$(swaymsg -t get_inputs | grep -m 1 'xkb_active_layout_name' | cut -d '"' -f 4)" [ "$layout" = "English (US)" ] && layout="us" @@ -137,25 +60,14 @@ get_layout() { echo "󰌌 $layout" } -get_apts() { - apts="$(calcurse -a | grep -c '\*')" - [ "$apts" = "0" ] && return 0 - echo "󰃭 $apts" -} - -get_todo() { - todo="$(calcurse -t | wc -l)" - [ "$todo" = "0" ] && return 0 - echo " $todo" -} while true ; do status="" - todo="$(get_todo)" + todo="$(cal todo count)" ! [ -z "$todo" ] && status="$status$separator$todo" - apts="$(get_apts)" + apts="$(cal apts count)" ! [ -z "$apts" ] && status="$status$separator$apts" volume="$(get_vol)" @@ -164,10 +76,10 @@ while true ; do microphone="$(get_mic)" ! [ -z "$microphone" ] && status="$status$separator$microphone" - network="$(get_net)" + network="$(netstat)" ! [ -z "$network" ] && status="$status$separator$network" - battery="$(get_bat)" + battery="$(batstat)" ! [ -z "$battery" ] && status="$status$separator$battery" layout="$(get_layout)" diff --git a/scripts/todo b/scripts/todo deleted file mode 100755 index d2f1f28..0000000 --- a/scripts/todo +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -currweek="# Week $(date '+%U')" - -if $(head -n1 ~/Documents/notes/note-todo.md | grep -q "^$currweek") ; then - bat -pp ~/Documents/notes/note-todo.md -else - sed -i "1s/^/$currweek\n/" ~/Documents/notes/note-todo.md - "$EDITOR" ~/Documents/notes/note-todo.md -fi - diff --git a/shell/aliasrc b/shell/aliasrc index 7ecccf2..d505cb0 100644 --- a/shell/aliasrc +++ b/shell/aliasrc @@ -30,7 +30,6 @@ alias \ # Command shortcuts alias \ mgr-all="mgr pacman_upgrade apt_upgrade flatpak_update distrobox_update pip_update configs passmgr" \ - cal='printf "\033[1m\033[34m=== %s ===\033[0m\n%s" "$(date -I)" "$(calcurse -a -t)"' \ df-short="df -h | grep -v '\s/dev.*$\|\s/run.*$\|\s/boot.*$'" \ wacom-setup-menu="wacom-setup menu" \ swayimg="swayimg -s fit -w 000000 -m" \