build.zig

@@ -17,13 +17,6 @@ pub fn build(b: *std.Build) void {
     const test_step = b.step("test", "Run unit tests");
     const lint_step = b.step("lint", "Run lints");
 
-    var version = std.ArrayList(u8).init(b.allocator);
-    defer version.deinit();
-    gen_version(b, version.writer()) catch {
-        version.clearAndFree();
-        version.appendSlice("unknown") catch {};
-    };
-
     return (if (release) &build_release else &build_development)(
         b,
         run_step,
@@ -36,7 +29,6 @@ pub fn build(b: *std.Build) void {
         use_llvm,
         pie,
         gui,
-        version.items,
     );
 }
 
@@ -52,7 +44,6 @@ fn build_development(
     use_llvm: ?bool,
     pie: ?bool,
     gui: bool,
-    version: []const u8,
 ) void {
     const target = b.standardTargetOptions(.{ .default_target = .{ .abi = if (builtin.os.tag == .linux and !tracy_enabled) .musl else null } });
     const optimize = b.standardOptimizeOption(.{});
@@ -72,7 +63,6 @@ fn build_development(
         use_llvm,
         pie,
         gui,
-        version,
     );
 }
 
@@ -88,7 +78,6 @@ fn build_release(
     use_llvm: ?bool,
     pie: ?bool,
     _: bool, //gui
-    version: []const u8,
 ) void {
     const targets: []const std.Target.Query = &.{
         .{ .cpu_arch = .x86_64, .os_tag = .linux, .abi = .musl },
@@ -102,8 +91,11 @@ fn build_release(
     };
     const optimize = .ReleaseFast;
 
+    var version = std.ArrayList(u8).init(b.allocator);
+    defer version.deinit();
+    gen_version(b, version.writer()) catch unreachable;
     const write_file_step = b.addWriteFiles();
-    const version_file = write_file_step.add("version", version);
+    const version_file = write_file_step.add("version", version.items);
     b.getInstallStep().dependOn(&b.addInstallFile(version_file, "version").step);
 
     for (targets) |t| {
@@ -128,7 +120,6 @@ fn build_release(
             use_llvm,
             pie,
             false, //gui
-            version,
         );
 
         if (t.os_tag == .windows)
@@ -147,7 +138,6 @@ fn build_release(
                 use_llvm,
                 pie,
                 true, //gui
-                version,
             );
     }
 }
@@ -167,7 +157,6 @@ pub fn build_exe(
     use_llvm: ?bool,
     pie: ?bool,
     gui: bool,
-    version: []const u8,
 ) void {
     const options = b.addOptions();
     options.addOption(bool, "enable_tracy", tracy_enabled);
@@ -194,8 +183,7 @@ pub fn build_exe(
     };
 
     const wf = b.addWriteFiles();
-    const version_file = wf.add("version", version);
+    const version_info_file = wf.add("version", version_info.items);
-    const version_info_file = wf.add("version_info", version_info.items);
 
     const vaxis_dep = b.dependency("vaxis", .{
         .target = target,
@@ -523,7 +511,6 @@ pub fn build_exe(
     exe.root_module.addImport("input", input_mod);
     exe.root_module.addImport("syntax", syntax_mod);
     exe.root_module.addImport("color", color_mod);
-    exe.root_module.addImport("version", b.createModule(.{ .root_source_file = version_file }));
     exe.root_module.addImport("version_info", b.createModule(.{ .root_source_file = version_info_file }));
 
     if (target.result.os.tag == .windows) {
@@ -566,7 +553,6 @@ pub fn build_exe(
     check_exe.root_module.addImport("input", input_mod);
     check_exe.root_module.addImport("syntax", syntax_mod);
     check_exe.root_module.addImport("color", color_mod);
-    check_exe.root_module.addImport("version", b.createModule(.{ .root_source_file = version_file }));
     check_exe.root_module.addImport("version_info", b.createModule(.{ .root_source_file = version_info_file }));
     check_step.dependOn(&check_exe.step);
 

src/main.zig

@@ -1,6 +1,5 @@
 const std = @import("std");
 const tui = @import("tui");
-const cbor = @import("cbor");
 const thespian = @import("thespian");
 const flags = @import("flags");
 const builtin = @import("builtin");
@@ -16,7 +15,6 @@ const c = @cImport({
 const build_options = @import("build_options");
 const log = @import("log");
 
-pub const version = @embedFile("version");
 pub const version_info = @embedFile("version_info");
 
 pub var max_diff_lines: usize = 50000;
@@ -305,27 +303,7 @@ pub fn main() anyerror!void {
 
     if (args.exec) |exec_str| {
         var cmds = std.mem.splitScalar(u8, exec_str, ';');
-        while (cmds.next()) |cmd| {
+        while (cmds.next()) |cmd| try tui_proc.send(.{ "cmd", cmd, .{} });
-            var count_args_ = std.mem.splitScalar(u8, cmd, ':');
-            var count: usize = 0;
-            while (count_args_.next()) |_| count += 1;
-            if (count == 0) break;
-
-            var msg = std.ArrayList(u8).init(a);
-            defer msg.deinit();
-            const writer = msg.writer();
-
-            var cmd_args = std.mem.splitScalar(u8, cmd, ':');
-            const cmd_ = cmd_args.next();
-            try cbor.writeArrayHeader(writer, 3);
-            try cbor.writeValue(writer, "cmd");
-            try cbor.writeValue(writer, cmd_);
-            try cbor.writeArrayHeader(writer, count - 1);
-
-            while (cmd_args.next()) |arg| try cbor.writeValue(writer, arg);
-
-            try tui_proc.send_raw(.{ .buf = msg.items });
-        }
     }
 
     ctx.run();
@@ -369,6 +347,7 @@ fn trace_json(json: thespian.message.json_string_view) callconv(.C) void {
 extern fn ___tracy_emit_message(txt: [*]const u8, size: usize, callstack: c_int) void;
 
 fn trace_to_file(m: thespian.message.c_buffer_type) callconv(.C) void {
+    const cbor = @import("cbor");
     const State = struct {
         file: std.fs.File,
         last_time: i64,
@@ -466,6 +445,7 @@ fn read_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs: *[][]
 }
 
 fn read_text_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs_: *[][]const u8, file_name: []const u8) !void {
+    const cbor = @import("cbor");
     var file = try std.fs.openFileAbsolute(file_name, .{ .mode = .read_only });
     defer file.close();
     const text = try file.readToEndAlloc(allocator, 64 * 1024);
@@ -501,6 +481,7 @@ fn read_text_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs_:
 }
 
 fn read_json_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs_: *[][]const u8, file_name: []const u8) !void {
+    const cbor = @import("cbor");
     var file = try std.fs.openFileAbsolute(file_name, .{ .mode = .read_only });
     defer file.close();
     const json = try file.readToEndAlloc(allocator, 64 * 1024);
@@ -521,6 +502,7 @@ fn read_cbor_config(
     file_name: []const u8,
     cb: []const u8,
 ) !void {
+    const cbor = @import("cbor");
     var iter = cb;
     var field_name: []const u8 = undefined;
     while (cbor.matchString(&iter, &field_name) catch |e| switch (e) {
@@ -631,6 +613,7 @@ fn config_eql(comptime T: type, a: T, b: T) bool {
 }
 
 fn write_json_file(comptime T: type, data: T, allocator: std.mem.Allocator, file_name: []const u8) !void {
+    const cbor = @import("cbor");
     var file = try std.fs.createFileAbsolute(file_name, .{ .truncate = true });
     defer file.close();
 

src/syntax/src/file_types.zig

@@ -48,7 +48,7 @@ pub const conf = .{
     .description = "Config",
     .color = 0x000000,
     .icon = "",
-    .extensions = .{ "conf", "log", "config", ".gitconfig", "gui_config" },
+    .extensions = .{ "conf", "config", ".gitconfig", "gui_config" },
     .highlights = fish.highlights,
     .comment = "#",
     .parser = fish.parser,

src/tui/home.zig

@@ -300,15 +300,8 @@ pub fn render(self: *Self, theme: *const Widget.Theme) bool {
         const x = @min(self.plane.dim_x() -| 32, 8);
         self.position_menu(self.v_center(5, self.menu_len, 5), self.center(x, self.menu_w));
     }
-
-    self.plane.cursor_move_yx(
-        @intCast(self.plane.dim_y() - 2),
-        @intCast(@max(self.plane.dim_x(), root.version.len + 3) - root.version.len - 3),
-    ) catch {};
-    self.plane.set_style_bg_transparent(style_subtext);
-    _ = self.plane.print("{s}", .{root.version}) catch return false;
-
     const more = self.menu.render(theme);
+
     return more or self.fire != null;
 }