about-system 0.0.41 → 0.0.46

package/src/info/platform.ts

@@ -50,7 +50,12 @@ export function os_info(context: InfoContext): string {
       osName = `Windows ${release}`;
     }
   } else if (IS_MAC) {
-    osName = `macOS ${release}`;
+    const productName = execCommand("sw_vers -productName");
+    const productVersion = execCommand("sw_vers -productVersion");
+    osName =
+      productName && productVersion
+        ? `${productName} ${productVersion}`
+        : `macOS ${release}`;
   } else if (IS_LINUX) {
     try {
       const osRelease = fs.readFileSync("/etc/os-release", "utf8");
@@ -119,6 +124,14 @@ export function device(context: InfoContext): string {
         return device;
       }
     } catch {}
+  } else if (IS_MAC) {
+    const profile = execCommand("system_profiler SPHardwareDataType");
+    const nameMatch = profile.match(/Model Name:\s*(.+)/);
+    if (nameMatch) {
+      const device = nameMatch[1].trim();
+      setCachedValue(context.cache, "device", device);
+      return device;
+    }
   } else if (IS_LINUX) {
     try {
       if (commandExists("getprop")) {

package/src/info/process.ts

@@ -5,13 +5,13 @@
 
 import os from "os";
 import type { InfoContext } from "../types/internal-types";
-import { IS_LINUX } from "../utils/platform";
+import { IS_LINUX, IS_MAC } from "../utils/platform";
 import { execCommand } from "../utils/command";
 import { getCachedValue, setCachedValue } from "../cache/cache";
 
 /**
  * Gets the highest CPU-consuming process
- * Uses ps command to find top process by CPU usage (Linux only)
+ * Uses ps command to find top process by CPU usage (Linux/macOS only)
  * @param context - Info context with cache
  * @returns Process info as "percentage processname" or empty string
  * @example "8% firefox", "15% chrome", "3% systemd"
@@ -33,6 +33,22 @@ export function top_process(context: InfoContext): string {
         return result;
       }
     } catch {}
+  } else if (IS_MAC) {
+    try {
+      // -c gives the short command name, -r sorts by %CPU descending
+      const ps = execCommand("ps -Aceo pcpu,comm -r");
+      const lines = ps.split("\n").filter((line) => line.trim());
+      if (lines.length > 1) {
+        const topProcess = lines[1].trim().split(/\s+/);
+        const cpuValue = Math.round(parseFloat(topProcess[0]));
+        const process = topProcess.slice(1).join(" ");
+        if (!isNaN(cpuValue) && process) {
+          const result = `${cpuValue}% ${process}`;
+          setCachedValue(context.cache, "top_process", result);
+          return result;
+        }
+      }
+    } catch {}
   }
 
   setCachedValue(context.cache, "top_process", "");
@@ -54,12 +70,12 @@ export function uptime(): string {
 
 /**
  * Gets number of logged in users
- * Uses who command to count active user sessions (Linux only)
+ * Uses who command to count active user sessions (Linux/macOS only)
  * @returns User count with "users" suffix or empty string
  * @example "3 users", "1 users"
  */
 export function users_logged_in(): string {
-  if (!IS_LINUX) return "";
+  if (!IS_LINUX && !IS_MAC) return "";
 
   try {
     const who = execCommand("who");

package/src/info/settings.ts

@@ -37,6 +37,7 @@ export const DEFAULT_SETTINGS = {
     ["user", "hostname", "os", "device", "kernel", "cpu", "gpu", "bench"],
     [
       "disk_used",
+      "disk_size",
       "ram_used",
       "top_process",
       "uptime",
@@ -44,13 +45,14 @@ export const DEFAULT_SETTINGS = {
       "battery",
       "load_average",
     ],
-    ["ip", "iplocal", "city", "domain", "isp"],
+    ["ip", "iplocal", "city"],
     ["shell", "services_running", "pacman", "containers"],
   ],
   colors: {
     user: "red",
     hostname: "orange",
     disk_used: "purple",
+    disk_size: "purple",
     ram_used: "yellow",
     top_process: "magenta",
     uptime: "cyan",
@@ -97,6 +99,7 @@ export const DEFAULT_SETTINGS = {
     shell: "🐚 ",
     pacman: "🚀 ",
     disk_used: "📁 ",
+    disk_size: "💽 ",
     ram_used: "💾 ",
     top_process: "🔝 ",
     uptime: "⏱️ ",
@@ -131,6 +134,7 @@ export const DEFAULT_SETTINGS = {
     shell: "Shell",
     pacman: "Packages",
     disk_used: "Disk",
+    disk_size: "Disk Size",
     ram_used: "RAM",
     top_process: "Top",
     uptime: "Uptime",
@@ -150,7 +154,7 @@ export const DEFAULT_SETTINGS = {
   },
   display: {
     show_emojis: true,
-    single_line: false,
+    single_line: true,
     line_wrap_length: process?.stdout?.columns || 100,
   },
   network: {
@@ -168,6 +172,7 @@ export interface Settings {
   labels: Record<string, string>;
   display: {
     show_emojis: boolean;
+    /** true: print one continuous line and let the terminal soft-wrap it; false: hard-wrap at line_wrap_length */
     single_line: boolean;
     line_wrap_length: number;
   };

package/src/info/software.ts

@@ -3,15 +3,17 @@
  * @module info/software
  */
 
+import os from "os";
 import process from "process";
 import type { InfoContext } from "../types/internal-types";
-import { IS_LINUX } from "../utils/platform";
+import { IS_WINDOWS } from "../utils/platform";
 import { execCommand, commandExists } from "../utils/command";
 import { getCachedValue, setCachedValue } from "../cache/cache";
 
 /**
  * Gets the current shell name
- * Uses ps command to find parent process shell (Linux/Unix only)
+ * Uses the user's login shell (macOS/Linux), falls back to ps for the
+ * parent process shell
  * @returns Shell name or empty string on Windows
  * @example "bash", "zsh", "fish", "nu"
  */
@@ -19,7 +21,16 @@ export function shell(context: InfoContext): string {
   const cached = getCachedValue(context.cache, "shell");
   if (cached !== null) return cached;
 
-  if (IS_LINUX) {
+  if (!IS_WINDOWS) {
+    try {
+      const loginShell = os.userInfo().shell;
+      if (loginShell) {
+        const shellName = loginShell.split("/").pop() as string;
+        setCachedValue(context.cache, "shell", shellName);
+        return shellName;
+      }
+    } catch {}
+
     try {
       const ppid = process.ppid;
       const shellName = execCommand(`ps -p ${ppid} -o comm=`).split("/").pop();
@@ -47,6 +58,7 @@ export function packages(context: InfoContext): string {
 
   const commands = [
     "apt",
+    "brew",
     "npm",
     "uv",
     "docker",

package/src/info/system-status.ts

@@ -6,17 +6,25 @@
 import fs from "fs";
 import os from "os";
 import type { InfoContext } from "../types/internal-types";
-import { IS_LINUX } from "../utils/platform";
+import { IS_LINUX, IS_MAC } from "../utils/platform";
 import { execCommand, commandExists } from "../utils/command";
 import { getCachedValue, setCachedValue } from "../cache/cache";
 
 /**
  * Gets system load averages
- * Reads 1, 5, and 15 minute load averages from /proc/loadavg (Linux only)
+ * Reads 1, 5, and 15 minute load averages from /proc/loadavg (Linux) or
+ * os.loadavg() (macOS)
  * @returns Space-separated load averages (1m 5m 15m) or empty string
  * @example "0.52 0.58 0.59", "2.10 1.95 1.88"
  */
 export function load_average(context: InfoContext): string {
+  if (IS_MAC) {
+    return os
+      .loadavg()
+      .map((n) => n.toFixed(2))
+      .join(" ");
+  }
+
   if (!IS_LINUX) return "";
 
   try {
@@ -38,6 +46,22 @@ export function battery(context: InfoContext): string {
   const cached = getCachedValue(context.cache, "battery");
   if (cached !== null) return cached;
 
+  if (IS_MAC) {
+    try {
+      const batt = execCommand("pmset -g batt");
+      const percentMatch = batt.match(/(\d+)%/);
+      if (percentMatch) {
+        const isCharging = /;\s*(charging|charged);/i.test(batt);
+        const result = `${percentMatch[1]}%${isCharging ? "+" : ""}`;
+        setCachedValue(context.cache, "battery", result);
+        return result;
+      }
+    } catch {}
+
+    setCachedValue(context.cache, "battery", "");
+    return "";
+  }
+
   if (!IS_LINUX) {
     setCachedValue(context.cache, "battery", "");
     return "";
@@ -68,7 +92,9 @@ export function battery(context: InfoContext): string {
 
 /**
  * Gets system temperature in Celsius
- * Reads from thermal zone or hwmon sensors (Linux only)
+ * Reads from thermal zone or hwmon sensors (Linux), or from the
+ * `osx-cpu-temp` CLI (macOS, if installed via `brew install osx-cpu-temp`) -
+ * macOS has no unprivileged API for this, so nothing is reported without it
  * @param context - Info context with cache
  * @returns Temperature with °C suffix or empty string
  * @example "45°C", "62°C"
@@ -77,6 +103,26 @@ export function temperature(context: InfoContext): string {
   const cached = getCachedValue(context.cache, "temperature");
   if (cached !== null) return cached;
 
+  if (IS_MAC) {
+    if (commandExists("osx-cpu-temp")) {
+      try {
+        const output = execCommand("osx-cpu-temp");
+        const match = output.match(/([\d.]+)\s*°?C/);
+        if (match) {
+          const tempC = Math.round(parseFloat(match[1]));
+          if (tempC > 0 && tempC < 150) {
+            const result = `${tempC}°C`;
+            setCachedValue(context.cache, "temperature", result);
+            return result;
+          }
+        }
+      } catch {}
+    }
+
+    setCachedValue(context.cache, "temperature", "");
+    return "";
+  }
+
   if (!IS_LINUX) {
     setCachedValue(context.cache, "temperature", "");
     return "";
@@ -118,6 +164,24 @@ export function services_running(context: InfoContext): string {
   const cached = getCachedValue(context.cache, "services_running");
   if (cached !== null) return cached;
 
+  if (IS_MAC) {
+    try {
+      const services = execCommand("launchctl list");
+      const serviceCount = services
+        .split("\n")
+        .filter((line) => line.trim() && !line.startsWith("PID")).length;
+
+      if (serviceCount > 0) {
+        const result = `${serviceCount} services`;
+        setCachedValue(context.cache, "services_running", result);
+        return result;
+      }
+    } catch {}
+
+    setCachedValue(context.cache, "services_running", "");
+    return "";
+  }
+
   if (!IS_LINUX) {
     setCachedValue(context.cache, "services_running", "");
     return "";

package/src/system-info-api.ts

@@ -21,6 +21,7 @@ import { user, hostname, os_info, kernel, device } from "./info/platform";
 import { cpu, gpu, screen_resolution, bench, cpu_bench_info, gpu_bench, gpu_bench_info } from "./info/hardware";
 import {
   disk_used,
+  disk_size,
   ram_used,
   memory_available,
   swap_used,
@@ -64,6 +65,7 @@ const CACHE_DURATION = {
   containers: 5 * 60 * 1000,
   top_process: 5 * 1000,
   disk_used: 60 * 1000,
+  disk_size: 60 * 1000,
   ram_used: 10 * 1000,
   services_running: 5 * 60 * 1000,
   temperature: 30 * 1000,
@@ -200,6 +202,7 @@ export const infoFunctions = {
   gpu_bench,
   gpu_bench_info,
   disk_used,
+  disk_size,
   ram_used,
   top_process,
   uptime,

package/src/systeminfo-types.d.ts

@@ -129,8 +129,8 @@ export interface SystemInfo {
    * Empty string if CPU not found or benchmark data unavailable
    *
    * @example
-   * - "💪 37.9k #1" (top performing CPU)
-   * - "💪 20.5k #68" (mid-range CPU)
+   * - "37.9k #1" (top performing CPU)
+   * - "20.5k #68" (mid-range CPU)
    * - "" (CPU not in benchmark database)
    */
   bench: string;
@@ -156,8 +156,8 @@ export interface SystemInfo {
    * Empty string if GPU not found or benchmark data unavailable
    *
    * @example
-   * - "💪 37.9k #1" (top performing GPU)
-   * - "💪 20.5k #68" (mid-range GPU)
+   * - "37.9k #1" (top performing GPU)
+   * - "20.5k #68" (mid-range GPU)
    * - "" (GPU not in benchmark database)
    */
   gpu_bench: string;
@@ -203,6 +203,18 @@ export interface SystemInfo {
    */
   disk_used: string;
 
+  /**
+   * Disk size (used/total) for each real disk
+   * Format: "used/total GB" when a single real disk is found, or
+   * "mount(used/total GB) ..." per disk when multiple are found
+   * Pseudo filesystems and small system/boot partitions (under 10GB) are
+   * excluded
+   * Empty string if unable to determine
+   *
+   * @example "256/512GB", "/(100/500GB) /Volumes/Backup(900/2000GB)"
+   */
+  disk_size: string;
+
   /**
    * Memory usage in gigabytes
    * Format: "used/total GB" showing current RAM consumption