mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-21 03:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2025-10-14 21:10:17 +02:00
parent 09c2cfb74d b2f51e5bc8
commit e577c454da
25 changed files with 135 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/Config.zig
View File

@@ -18,9 +18,9 @@ bigclock_seconds: bool = false,
blank_box: bool = true,
border_fg: u32 = 0x00FFFFFF,
box_title: ?[]const u8 = null,
brightness_down_cmd: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl -q s 10%-",
brightness_down_cmd: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl -q -n s 10%-",
brightness_down_key: ?[]const u8 = "F5",
brightness_up_cmd: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl -q s +10%",
brightness_up_cmd: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl -q -n s +10%",
brightness_up_key: ?[]const u8 = "F6",
clear_password: bool = false,
clock: ?[:0]const u8 = null,
@@ -49,6 +49,7 @@ gameoflife_initial_density: f32 = 0.4,
hide_borders: bool = false,
hide_version_string: bool = false,
hide_key_hints: bool = false,
battery_id: ?[]const u8 = "BAT0",
initial_info_text: ?[]const u8 = null,
input_len: u8 = 34,
lang: []const u8 = "en",

1
src/config/Lang.zig
View File

@@ -47,6 +47,7 @@ err_perm_group: []const u8 = "failed to downgrade group permissions",
err_perm_user: []const u8 = "failed to downgrade user permissions",
err_pwnam: []const u8 = "failed to get user info",
err_sleep: []const u8 = "failed to execute sleep command",
err_battery: []const u8 = "failed to load battery status",
err_switch_tty: []const u8 = "failed to switch tty",
err_tty_ctrl: []const u8 = "tty control transfer failed",
err_no_users: []const u8 = "no users found",