From be5a68dd1d33bc0e43749504e5edc83cb0331958 Mon Sep 17 00:00:00 2001 From: jack-avery <47289484+jack-avery@users.noreply.github.com> Date: Fri, 28 Mar 2025 00:47:12 -0400 Subject: [PATCH 1/3] allow specify multiple dirs --- src/main.zig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main.zig b/src/main.zig index 569fa88..b27117b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -288,8 +288,16 @@ pub fn main() !void { try info_line.addMessage(hostname, config.bg, config.fg); } - try crawl(&session, lang, config.waylandsessions, .wayland); - if (build_options.enable_x11_support) try crawl(&session, lang, config.xsessions, .x11); + var waylandsessiondirs = std.mem.splitScalar(u8, config.waylandsessions, ':'); + while (waylandsessiondirs.next()) |dir| { + try crawl(&session, lang, dir, .wayland); + } + if (build_options.enable_x11_support) { + var xsessiondirs = std.mem.splitScalar(u8, config.xsessions, ':'); + while (xsessiondirs.next()) |dir| { + try crawl(&session, lang, dir, .x11); + } + } var login = Text.init(allocator, &buffer, false, null); defer login.deinit(); From b7e37ce1b7f300f378eb7cb9253b131ea8127155 Mon Sep 17 00:00:00 2001 From: jack-avery <47289484+jack-avery@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:00:47 -0400 Subject: [PATCH 2/3] update config comments --- res/config.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/config.ini b/res/config.ini index c197fb8..53050e4 100644 --- a/res/config.ini +++ b/res/config.ini @@ -222,6 +222,8 @@ vi_default_mode = normal vi_mode = false # Wayland desktop environments +# You can specify multiple directories, +# e.g. /usr/share/wayland-sessions:/usr/local/share/wayland-sessions waylandsessions = $PREFIX_DIRECTORY/share/wayland-sessions # Xorg server command @@ -235,4 +237,6 @@ xauth_cmd = $PREFIX_DIRECTORY/bin/xauth xinitrc = ~/.xinitrc # Xorg desktop environments +# You can specify multiple directories, +# e.g. /usr/share/xsessions:/usr/local/share/xsessions xsessions = $PREFIX_DIRECTORY/share/xsessions From fecc6884189cedf03082e9eeb8a57af6dfb0180f Mon Sep 17 00:00:00 2001 From: jack-avery <47289484+jack-avery@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:01:33 -0400 Subject: [PATCH 3/3] snake case --- src/main.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.zig b/src/main.zig index b27117b..bd89b15 100644 --- a/src/main.zig +++ b/src/main.zig @@ -288,13 +288,13 @@ pub fn main() !void { try info_line.addMessage(hostname, config.bg, config.fg); } - var waylandsessiondirs = std.mem.splitScalar(u8, config.waylandsessions, ':'); - while (waylandsessiondirs.next()) |dir| { + var wayland_session_dirs = std.mem.splitScalar(u8, config.waylandsessions, ':'); + while (wayland_session_dirs.next()) |dir| { try crawl(&session, lang, dir, .wayland); } if (build_options.enable_x11_support) { - var xsessiondirs = std.mem.splitScalar(u8, config.xsessions, ':'); - while (xsessiondirs.next()) |dir| { + var x_session_dirs = std.mem.splitScalar(u8, config.xsessions, ':'); + while (x_session_dirs.next()) |dir| { try crawl(&session, lang, dir, .x11); } }