diff --git a/modules/home/scripts/scripts/maxfetch.sh b/modules/home/scripts/scripts/maxfetch.sh old mode 100644 new mode 100755 index c8b32d1..c1413ef --- a/modules/home/scripts/scripts/maxfetch.sh +++ b/modules/home/scripts/scripts/maxfetch.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -unicode=" ■" +unicode=" " version="1.2.0" _black=$(tput setaf 0) @@ -15,31 +15,46 @@ _bright=$(tput bold) normal=$(tput sgr0) _underline=$(tput smul) -up=$(uptime | sed -E 's/^[^,]*up *//; s/mins/minutes/; s/hrs?/hours/; - s/([[:digit:]]+):0?([[:digit:]]+)/\1 hours, \2 minutes/; - s/^1 hours/1 hour/; s/ 1 hours/ 1 hour/; - s/min,/minutes,/; s/ 0 minutes,/ less than a minute,/; s/ 1 minutes/ 1 minute/; - s/ / /; s/, *[[:digit:]]* users?.*//') +# up=$(uptime | sed -E 's/^[^,]*up *//; s/mins/minutes/; s/hrs?/hours/; + # s/([[:digit:]]+):0?([[:digit:]]+)/\1 hours, \2 minutes/; + # s/^1 hours/1 hour/; s/ 1 hours/ 1 hour/; + # s/min,/minutes,/; s/ 0 minutes,/ less than a minute,/; s/ 1 minutes/ 1 minute/; + # s/ / /; s/, *[[:digit:]]* users?.*//') + +up=$( + uptime | awk -F'( |,|:)+' '{ + d=h=m=0; + if ($7=="min") + m=$6; + else { + if ($7~/^day/) { d=$6; h=$8; m=$9} + else {h=$6;m=$7} + } + } + { + print h+0,"h",m+0,"m" + }' +) + +pkgs=$(nix-store --query --requisites /run/current-system | wc -l) fetch() { - echo "${blue} _ ___ ____ ${normal}" - echo "${blue} / | / (_) __/ __ \_____${normal}" - echo "${blue} / |/ / / |/_/ / / / ___/${normal}" - echo "${blue} / /| / />