Make About answer what fastfetch answers
About reported four component versions and, since this morning, a short hardware summary. It now covers what someone actually wants from an About page or a fastfetch run: operating system, model, hostname, kernel, uptime, package counts, shell, locale, windowing system, resolution, processor, graphics, memory, swap, and disk. Rows are ordered the way fastfetch presents them -- what the system is, then what is installed on it, then the hardware underneath -- and the GPU rows are spliced in directly after Processor rather than appended, because a graphics card listed after "Disk" reads as an afterthought. Graphics is still joined from GraphicsDevices rather than read a second time, so the two readouts cannot disagree. Memory is total, not used. About is not a monitor: a "12.4 GiB used" figure is stale before it finishes drawing, and the Home page's vitals readout is where live numbers belong. Disk is the exception because free space does not move while you look at it. Package counting is why this whole helper runs on demand -- rpm -qa on a full workstation is a few thousand lines and takes a moment. Swap and package counts are omitted entirely when they are zero or the tools are absent, rather than reported as "0" or "Unknown". Claude-Session: https://claude.ai/code/session_01BRvzt4H8XXLPVH5MyYdk9L
This commit is contained in:
@@ -2,10 +2,11 @@
|
|||||||
|
|
||||||
# What this machine is, as JSON: {label, value} pairs in display order.
|
# What this machine is, as JSON: {label, value} pairs in display order.
|
||||||
#
|
#
|
||||||
# GNOME's About panel answers "what am I running on" in one screen -- model,
|
# GNOME's About panel answers "what am I running on" in one screen, and
|
||||||
# processor, memory, disk, OS, kernel, windowing system. Panama's About listed
|
# fastfetch answers it in more detail; this covers both -- model, OS, kernel,
|
||||||
# only its own component versions, which answers a different and much narrower
|
# uptime, package counts, shell, resolution, processor, memory, swap, disk and
|
||||||
# question.
|
# locale. Rows are ordered roughly the way fastfetch presents them: what the
|
||||||
|
# system is, then what is installed on it, then the hardware underneath.
|
||||||
#
|
#
|
||||||
# Graphics is deliberately absent: GraphicsDevices already enumerates GPUs for
|
# Graphics is deliberately absent: GraphicsDevices already enumerates GPUs for
|
||||||
# the vitals readout, and naming them again here would be a second source of
|
# the vitals readout, and naming them again here would be a second source of
|
||||||
@@ -24,7 +25,13 @@ emit() {
|
|||||||
facts+=("$(jq -cn --arg label "$1" --arg value "$2" '{label: $label, value: $value}')")
|
facts+=("$(jq -cn --arg label "$1" --arg value "$2" '{label: $label, value: $value}')")
|
||||||
}
|
}
|
||||||
|
|
||||||
# ── Machine ──────────────────────────────────────────────────────────────────
|
# ── System ───────────────────────────────────────────────────────────────────
|
||||||
|
if [[ -r /etc/os-release ]]; then
|
||||||
|
# Sourced in a subshell so the variables cannot leak into this script.
|
||||||
|
os="$( . /etc/os-release 2>/dev/null && printf '%s' "${PRETTY_NAME:-$NAME}" )"
|
||||||
|
emit "Operating system" "$os"
|
||||||
|
fi
|
||||||
|
|
||||||
# DMI strings are frequently placeholders ("To Be Filled By O.E.M.", "Default
|
# DMI strings are frequently placeholders ("To Be Filled By O.E.M.", "Default
|
||||||
# string"). Those are worse than nothing, so they are filtered out.
|
# string"). Those are worse than nothing, so they are filtered out.
|
||||||
dmi() {
|
dmi() {
|
||||||
@@ -45,8 +52,55 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
emit "Hostname" "$(hostnamectl hostname 2>/dev/null || hostname 2>/dev/null)"
|
emit "Hostname" "$(hostnamectl hostname 2>/dev/null || hostname 2>/dev/null)"
|
||||||
|
emit "Kernel" "$(uname -r 2>/dev/null)"
|
||||||
|
|
||||||
|
# `uptime -p` already reads as prose ("1 week, 23 hours, 5 minutes"); only the
|
||||||
|
# leading "up " needs removing.
|
||||||
|
emit "Uptime" "$(uptime -p 2>/dev/null | sed 's/^up //')"
|
||||||
|
|
||||||
|
# ── Installed ────────────────────────────────────────────────────────────────
|
||||||
|
# Counted rather than listed. rpm -qa on a full workstation is a few thousand
|
||||||
|
# lines and takes a moment, which is part of why this whole helper runs on
|
||||||
|
# demand rather than at startup.
|
||||||
|
packages=""
|
||||||
|
if command -v rpm >/dev/null 2>&1; then
|
||||||
|
rpm_count="$(rpm -qa 2>/dev/null | wc -l)"
|
||||||
|
[[ "$rpm_count" -gt 0 ]] && packages="$rpm_count rpm"
|
||||||
|
fi
|
||||||
|
if command -v flatpak >/dev/null 2>&1; then
|
||||||
|
flatpak_count="$(flatpak list --app 2>/dev/null | wc -l)"
|
||||||
|
if [[ "$flatpak_count" -gt 0 ]]; then
|
||||||
|
[[ -n "$packages" ]] && packages="$packages, "
|
||||||
|
packages="$packages$flatpak_count flatpak"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
emit "Packages" "$packages"
|
||||||
|
|
||||||
|
# $SHELL is the login shell, which is the one worth reporting -- the shell this
|
||||||
|
# script happens to run under is an implementation detail of the caller.
|
||||||
|
if [[ -n "${SHELL:-}" ]]; then
|
||||||
|
shell_name="$(basename "$SHELL")"
|
||||||
|
shell_version="$("$SHELL" --version 2>/dev/null | head -1 | grep -oE '[0-9]+\.[0-9]+(\.[0-9]+)?' | head -1)"
|
||||||
|
emit "Shell" "${shell_name}${shell_version:+ $shell_version}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
emit "Locale" "${LANG:-}"
|
||||||
|
|
||||||
|
case "${XDG_SESSION_TYPE:-}" in
|
||||||
|
wayland) emit "Windowing system" "Wayland" ;;
|
||||||
|
x11) emit "Windowing system" "X11" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# ── Hardware ─────────────────────────────────────────────────────────────────
|
||||||
|
# The focused monitor's actual mode, including the fractional scale, since a
|
||||||
|
# 4500x3000 panel at 1.5 presents very differently from one at 1.
|
||||||
|
if command -v hyprctl >/dev/null 2>&1; then
|
||||||
|
emit "Resolution" "$(hyprctl -j monitors 2>/dev/null \
|
||||||
|
| jq -r 'map(select(.focused)) + . | .[0]
|
||||||
|
| select(. != null)
|
||||||
|
| "\(.width)x\(.height) @ \(.refreshRate | floor)Hz · scale \(.scale)"' 2>/dev/null)"
|
||||||
|
fi
|
||||||
|
|
||||||
# ── Processor ────────────────────────────────────────────────────────────────
|
|
||||||
cpu="$(awk -F': ' '/^model name/ { print $2; exit }' /proc/cpuinfo 2>/dev/null)"
|
cpu="$(awk -F': ' '/^model name/ { print $2; exit }' /proc/cpuinfo 2>/dev/null)"
|
||||||
threads="$(nproc 2>/dev/null)"
|
threads="$(nproc 2>/dev/null)"
|
||||||
if [[ -n "$cpu" ]]; then
|
if [[ -n "$cpu" ]]; then
|
||||||
@@ -56,26 +110,18 @@ if [[ -n "$cpu" ]]; then
|
|||||||
emit "Processor" "$cpu"
|
emit "Processor" "$cpu"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ── Memory ───────────────────────────────────────────────────────────────────
|
|
||||||
# Reported as the kernel sees it, which is a little under the sticker figure
|
# Reported as the kernel sees it, which is a little under the sticker figure
|
||||||
# because firmware and integrated graphics reserve some before Linux starts.
|
# because firmware and integrated graphics reserve some before Linux starts.
|
||||||
|
#
|
||||||
|
# Total rather than used: About is not a monitor, and a "12.4 GiB used" figure
|
||||||
|
# is stale before it finishes drawing. The Home page's vitals readout is where
|
||||||
|
# live numbers belong.
|
||||||
emit "Memory" "$(awk '/^MemTotal:/ { printf "%.1f GiB", $2 / 1048576 }' /proc/meminfo 2>/dev/null)"
|
emit "Memory" "$(awk '/^MemTotal:/ { printf "%.1f GiB", $2 / 1048576 }' /proc/meminfo 2>/dev/null)"
|
||||||
|
|
||||||
# ── Storage ──────────────────────────────────────────────────────────────────
|
swap="$(awk '/^SwapTotal:/ { if ($2 > 0) printf "%.1f GiB", $2 / 1048576 }' /proc/meminfo 2>/dev/null)"
|
||||||
|
emit "Swap" "$swap"
|
||||||
|
|
||||||
read -r size used avail <<<"$(df -h --output=size,used,avail / 2>/dev/null | tail -1)"
|
read -r size used avail <<<"$(df -h --output=size,used,avail / 2>/dev/null | tail -1)"
|
||||||
[[ -n "${size:-}" ]] && emit "Disk" "$avail free of $size"
|
[[ -n "${size:-}" ]] && emit "Disk" "$avail free of $size"
|
||||||
|
|
||||||
# ── Software ─────────────────────────────────────────────────────────────────
|
|
||||||
if [[ -r /etc/os-release ]]; then
|
|
||||||
# Sourced in a subshell so the variables cannot leak into this script.
|
|
||||||
os="$( . /etc/os-release 2>/dev/null && printf '%s' "${PRETTY_NAME:-$NAME}" )"
|
|
||||||
emit "Operating system" "$os"
|
|
||||||
fi
|
|
||||||
emit "Kernel" "$(uname -r 2>/dev/null)"
|
|
||||||
|
|
||||||
case "${XDG_SESSION_TYPE:-}" in
|
|
||||||
wayland) emit "Windowing system" "Wayland" ;;
|
|
||||||
x11) emit "Windowing system" "X11" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
printf '[%s]\n' "$(IFS=,; printf '%s' "${facts[*]}")"
|
printf '[%s]\n' "$(IFS=,; printf '%s' "${facts[*]}")"
|
||||||
|
|||||||
Reference in New Issue
Block a user