refractor, optimization, conditional fetching, aur package setup

Author: nuIIpointerexception

.SRCINFO

@@ -0,0 +1,15 @@
+pkgbase = lifetch-git
+	pkgdesc = Fast system information fetcher written in zig
+	pkgver = 0.1.1.r23.gffcbaad
+	pkgrel = 1
+	url = https://github.com/nuiipointerexception/lifetch
+	arch = x86_64
+	arch = aarch64
+	license = MIT
+	makedepends = zig
+	makedepends = git
+	depends = glibc
+	source = git+https://github.com/nuiipointerexception/lifetch.git
+	sha256sums = SKIP
+
+pkgname = lifetch-git

.gitignore

@@ -1,2 +1,13 @@
 .zig-cache/*
-zig-out/*
+zig-out/*
+
+# PKGBUILD
+*.tar.gz
+*.pkg.tar.zst
+*.pkg.tar.xz
+*.pkg.tar.bz2
+*.pkg.tar
+*.pkg.tar.gz
+*.pkg.tar.bz2
+*.pkg.tar.xz
+*.pkg.tar.zst

LICENSE

@@ -4,4 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

PKGBUILD

@@ -1,24 +1,37 @@
 # Maintainer: viable <hi@viable.gg>
-pkgname=lifetch
-pkgver=0.1.0
+pkgname=lifetch-git
+pkgver=0.1.1.r23.gffcbaad
 pkgrel=1
 pkgdesc="Fast system information fetcher written in zig"
-arch=('x86_64')
+arch=('x86_64' 'aarch64')
 url="https://github.com/nuiipointerexception/lifetch"
 license=('MIT')
-depends=()
-makedepends=('zig')
+depends=('glibc')
+makedepends=('zig' 'git')
 source=("git+${url}.git")
 sha256sums=('SKIP')
 
+pkgver() {
+    cd "$pkgname"
+    git describe --long --tags --abbrev=7 --match="v*" HEAD 2>/dev/null || \
+    echo "0.1.1.r$(git rev-list --count HEAD).g$(git rev-parse --short=7 HEAD)"
+}
+
+prepare() {
+    cd "$pkgname"
+}
+
 build() {
     cd "$pkgname"
-    zig build -Doptimize=ReleaseSafe
+    zig build \
+        --summary all \
+        -Doptimize=ReleaseFast \
+        -Dcpu=native
 }
 
 package() {
     cd "$pkgname"
     install -Dm755 zig-out/bin/lifetch "$pkgdir/usr/bin/lifetch"
     install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-} 
+} 

README.md

@@ -1,11 +1,39 @@
 # lifetch
+
 the fastest way to fetch your system info!
 
-sub 1ms execution time!
+```bash
+ ~ zig build --release=fast && hyperfine --warmup 10 --runs 1000 'zig-out/bin/lifetch'
+Benchmark 1: zig-out/bin/lifetch
+  Time (mean ± σ):     264.4 µs ± 144.3 µs    [User: 253.7 µs, System: 492.1 µs]
+  Range (min … max):     0.0 µs … 906.6 µs    1000 runs
+```
+
+## tested on
+
+- archlinux
+
+more to come!
+
+## prerequisites
+
+- [zig master](https://ziglang.org/)
+
+i recommend installing `zig-nightly-bin` from the aur if you are on archlinux.
+
+## config
+
+generated inside your home directory at
+`~/.config/lifetch/config.ini`
+
+## building
+
+```bash
+zig build --release=fast
+```
+
+## running
 
 ```bash
-hyperfine --warmup 10 --runs 100 './lifetch'
-Benchmark 1: ./lifetch
-  Time (mean ± σ):     919.1 µs ± 638.6 µs    [User: 141.0 µs, System: 1166.9 µs]
-  Range (min … max):     0.0 µs … 1999.5 µs    100 runs
+zig build run --release=fast
 ```

build.zig

@@ -4,15 +4,19 @@ pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const exe_mod = b.createModule(.{
+    const mod = b.createModule(.{
         .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
     });
 
+    mod.addAnonymousImport("config", .{
+        .root_source_file = b.path("config.ini"),
+    });
+
     const exe = b.addExecutable(.{
         .name = "lifetch",
-        .root_module = exe_mod,
+        .root_module = mod,
     });
 
     b.installArtifact(exe);
@@ -21,7 +25,4 @@ pub fn build(b: *std.Build) void {
     run_cmd.step.dependOn(b.getInstallStep());
     const run_step = b.step("run", "fetch your system info");
     run_step.dependOn(&run_cmd.step);
-
-    const check_step = b.step("check", "zls diagnostics");
-    check_step.dependOn(b.getInstallStep());
 }

build.zig.zon

@@ -1,9 +1,12 @@
 .{
     .name = "lifetch",
-    .version = "0.0.1",
+    .version = "0.1.1",
     .paths = .{
         "build.zig",
         "build.zig.zon",
         "src",
+        "config.ini",
+        "README.md",
+        "LICENSE",
     },
 }

config.ini

@@ -0,0 +1,26 @@
+# Lifetch Configuration
+#
+# Format your output using these placeholders:
+# {user}           - Current username
+# {host}           - Hostname
+# {shell}          - Current shell
+# {term}           - Terminal name
+# {uptime}         - System uptime
+# {pkgs}           - Package count
+# {session}        - Wayland/X11
+# {wm}             - Window manager
+# {distro}         - Linux distribution (short form)
+# {distro_pretty}  - Linux distribution (pretty name)
+#
+# Colors and Styles:
+# Basic colors: {red}text{/red}, {green}text{/green}, etc.
+# RGB colors: {rgb(255,0,0)}text{/rgb}
+# Styles: {bold}text{/bold}, {underline}text{/underline}, etc.
+#
+# Example formats:
+# format = "{bold}{red}{user}@{host}{/red}{/bold} on {green}{term}{/green}"
+# format = "{rgb(255,165,0)}os{/rgb}: {host} | {bold}shell{/bold}: {shell}"
+
+format = {bold}{cyan}{user}@{host}{/cyan}{/bold} since: {uptime}
+{green}{shell}{/green} on {yellow}{term}{/yellow}
+{magenta}{pkgs}{/magenta} pkgs on {blue}{distro} / {blue}{wm} / {blue}{session}{/blue} 

src/color.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const os = std.os;
 const fs = std.fs;
+const builtin = @import("builtin");
 
 pub const ColorSupport = struct {
     truecolor: bool = false,
@@ -29,7 +29,7 @@ pub const ColorSupport = struct {
         }
     };
 
-    fn parseColorTag(tag: []const u8) ?Color {
+    pub fn parseColorTag(tag: []const u8) ?Color {
         return switch (tag[0]) {
             'b' => if (std.mem.eql(u8, tag, "black")) .black else if (std.mem.eql(u8, tag, "blue")) .blue else null,
             'r' => if (std.mem.eql(u8, tag, "red")) .red else null,
@@ -42,7 +42,7 @@ pub const ColorSupport = struct {
         };
     }
 
-    fn parseStyleTag(tag: []const u8) ?[]const u8 {
+    pub fn parseStyleTag(tag: []const u8) ?[]const u8 {
         return switch (tag[0]) {
             'b' => if (std.mem.eql(u8, tag, "bold")) Style.bold else if (std.mem.eql(u8, tag, "blink")) Style.blink else null,
             'd' => if (std.mem.eql(u8, tag, "dim")) Style.dim else null,
@@ -55,7 +55,7 @@ pub const ColorSupport = struct {
         };
     }
 
-    fn parseRgbTag(tag: []const u8) !Rgb {
+    pub fn parseRgbTag(tag: []const u8) !Rgb {
         if (!std.mem.startsWith(u8, tag, "rgb(") or !std.mem.endsWith(u8, tag, ")")) {
             return error.InvalidColorFormat;
         }
@@ -126,34 +126,56 @@ pub const ColorSupport = struct {
 
     pub fn formatText(self: *const ColorSupport, text: []const u8, writer: anytype) !void {
         var i: usize = 0;
-        while (i < text.len) : (i += 1) {
-            if (text[i] == '{') {
-                const end_idx = std.mem.indexOfScalarPos(u8, text, i, '}') orelse break;
+        const len = text.len;
+
+        while (i < len) {
+            if (text[i] == '{' and i + 1 < len) {
+                const start_idx = i;
+                const end_idx = std.mem.indexOfScalarPos(u8, text, i, '}') orelse {
+                    try writer.writeByte(text[i]);
+                    i += 1;
+                    continue;
+                };
+
                 const tag = text[i + 1 .. end_idx];
 
-                if (std.mem.startsWith(u8, tag, "/")) {
+                if (tag.len > 0 and tag[0] == '/') {
                     try writer.writeAll("\x1b[0m");
-                    i = end_idx;
+                    i = end_idx + 1;
                     continue;
                 }
 
+                var processed = false;
+
                 if (std.mem.startsWith(u8, tag, "rgb(")) {
                     if (self.truecolor) {
-                        const rgb = ColorSupport.parseRgbTag(tag) catch continue;
-                        try writer.print("\x1b[38;2;{};{};{}m", .{ rgb.r, rgb.g, rgb.b });
+                        if (ColorSupport.parseRgbTag(tag)) |rgb| {
+                            try writer.print("\x1b[38;2;{};{};{}m", .{ rgb.r, rgb.g, rgb.b });
+                            processed = true;
+                        } else |_| {}
                     }
-                } else if (ColorSupport.parseColorTag(tag)) |c| {
-                    if (self.basic) {
+                } else if (self.basic) {
+                    if (ColorSupport.parseColorTag(tag)) |c| {
                         try writer.writeAll(c.ansiSequence());
+                        processed = true;
                     }
-                } else if (ColorSupport.parseStyleTag(tag)) |s| {
-                    try writer.writeAll(s);
-                } else {
-                    try writer.writeAll(text[i .. end_idx + 1]);
                 }
-                i = end_idx;
+
+                if (!processed) {
+                    if (ColorSupport.parseStyleTag(tag)) |s| {
+                        try writer.writeAll(s);
+                        processed = true;
+                    }
+                }
+
+                if (!processed) {
+                    try writer.writeAll(text[start_idx .. end_idx + 1]);
+                }
+
+                i = end_idx + 1;
             } else {
                 try writer.writeByte(text[i]);
+                i += 1;
             }
         }
     }
@@ -305,7 +327,6 @@ pub const Style = struct {
     }
 };
 
-// Initialize color support at runtime
 var color_support: ?ColorSupport = null;
 
 pub fn getColorSupport() ColorSupport {